当前批次发货商品数据

src/main/java/com/caimei365/order/controller/ShipApi.java

@@ -4,6 +4,7 @@ import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.LogisticsBatchDto;
 import com.caimei365.order.model.dto.LogisticsDto;
 import com.caimei365.order.model.vo.CompanyVo;
+import com.caimei365.order.model.vo.LogisticsRecordVo;
 import com.caimei365.order.model.vo.SettlementVo;
 import com.caimei365.order.model.vo.ShopOrderVo;
 import com.caimei365.order.service.ShipService;
@@ -76,9 +77,9 @@ public class ShipApi {
     }
 
     /**
-     * 供应商子订单详情
+     * 供应商订单详情
      */
-    @ApiOperation("供应商子订单详情（旧：/supplier/shopOrderDetails）")
+    @ApiOperation("供应商订单详情（旧：/supplier/shopOrderDetails）")
     @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单Id")
     @GetMapping("/detail")
     public ResponseJson<Map<String, Object>> getShopOrderDetail(Integer shopOrderId) {
@@ -102,9 +103,9 @@ public class ShipApi {
     }
 
     /**
-     * 发货页面子订单数据
+     * 发货页面订单数据
      */
-    @ApiOperation("供应商订单列表（旧：/supplier/shipmentsInfo）")
+    @ApiOperation("发货页面订单数据（旧：/supplier/shipmentsInfo）")
     @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单Id")
     @GetMapping("/ship/info")
     public ResponseJson<ShopOrderVo> getShopOrderInfo(Integer shopOrderId) {
@@ -191,6 +192,19 @@ public class ShipApi {
         return shipService.cancelDelivery(logisticsBatchDto.getLogisticsBatchId());
     }
 
+    /**
+     * 当前批次发货商品数据
+     */
+    @ApiOperation("当前批次发货商品数据（旧：/supplier/logisticsRecord）")
+    @ApiImplicitParam(required = true, name = "logisticsInfoId", value = "发货物流信息Id")
+    @GetMapping("/ship/logistics/record")
+    public ResponseJson<List<LogisticsRecordVo>> getLogisticsRecord(Integer logisticsBatchId) {
+        if (null == logisticsBatchId) {
+            return ResponseJson.error("发货物流信息Id不能为空！", null);
+        }
+        return shipService.getLogisticsRecord(logisticsBatchId);
+    }
+
     /**
      * 发货记录-添加物流
      *

src/main/java/com/caimei365/order/mapper/ShipMapper.java

@@ -124,6 +124,11 @@ public interface ShipMapper {
      * @param logisticsBatchId 发货物流批次Id
      */
     void deleteLogisticsInfoByBatchId(Integer logisticsBatchId);
+    /**
+     * 当前批次发货商品数据
+     * @param logisticsBatchId 发货物流批次Id
+     */
+    List<LogisticsRecordVo> getLogisticsRecord(Integer logisticsBatchId);
     /**
      * 结算记录
      * @param shopOrderId 子订单Id

src/main/java/com/caimei365/order/service/ShipService.java

@@ -4,6 +4,7 @@ import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.LogisticsBatchDto;
 import com.caimei365.order.model.dto.LogisticsDto;
 import com.caimei365.order.model.vo.CompanyVo;
+import com.caimei365.order.model.vo.LogisticsRecordVo;
 import com.caimei365.order.model.vo.SettlementVo;
 import com.caimei365.order.model.vo.ShopOrderVo;
 import com.github.pagehelper.PageInfo;
@@ -89,6 +90,11 @@ public interface ShipService {
      * @param logisticsBatchId 发货物流批次Id
      */
     ResponseJson<Void> cancelDelivery(Integer logisticsBatchId);
+    /**
+     * 当前批次发货商品数据
+     * @param logisticsBatchId 发货物流批次Id
+     */
+    ResponseJson<List<LogisticsRecordVo>> getLogisticsRecord(Integer logisticsBatchId);
     /**
      * 发货记录-添加物流
      * @param logisticsBatchDto {

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -542,6 +542,17 @@ public class ShipServiceImpl implements ShipService {
         return ResponseJson.success(null);
     }
 
+    /**
+     * 当前批次发货商品数据
+     *
+     * @param logisticsBatchId 发货物流批次Id
+     */
+    @Override
+    public ResponseJson<List<LogisticsRecordVo>> getLogisticsRecord(Integer logisticsBatchId) {
+        List<LogisticsRecordVo> recordList = shipMapper.getLogisticsRecord(logisticsBatchId);
+        return ResponseJson.success(recordList);
+    }
+
     /**
      * 发货记录-添加物流
      *

src/main/resources/mapper/ShipMapper.xml

@@ -321,5 +321,18 @@
         </if>
         AND delFlag = '0'
     </select>
+    <select id="getLogisticsRecord" resultType="com.caimei365.order.model.vo.LogisticsRecordVo">
+        SELECT
+            logisticsBatchID AS logisticsBatchId,
+            shopOrderID AS shopOrderId,
+            orderID AS orderId,
+            orderProductID AS orderProductId,
+            productID AS productId,
+            buyNum,
+            num,
+            productName,
+            image
+        FROM cm_logistics_record WHERE logisticsBatchID = #{logisticsBatchId}
+    </select>
 
 </mapper>