打单分页

sd-business/src/main/java/com/sd/business/service/order/impl/IssueBillServiceImpl.java

@@ -104,7 +104,7 @@ public class IssueBillServiceImpl implements IssueBillService {
         QueryWrapper<OrderEncasement> orderEncasementWrapper = new QueryWrapper<>();
         orderEncasementWrapper.select(
                 "order_id as orderId",
-                "ifnull(sum(netWeight*total),0) totalNetWeight",
+                "ifnull(sum(net_weight*total),0) totalNetWeight",
                 "ifnull(sum(length*width*height*total/1000000),0) totalVolume"
         );
         orderEncasementWrapper.in("order_id", orderIdList);
@@ -266,7 +266,7 @@ public class IssueBillServiceImpl implements IssueBillService {
         OrderEncasement orderEncasement = orderEncasementService.getById(dto.getId());
         orderEncasement.setTotal(orderEncasement.getTotal() + dto.getTotal());
         orderEncasementService.updateById(dto);
-        return verifiedQuantity(orderEncasement.getOrderId());
+        return verifiedQuantityAndGetDetail(orderEncasement.getOrderId());
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -281,17 +281,16 @@ public class IssueBillServiceImpl implements IssueBillService {
 
         orderEncasementDetailList.forEach(item -> {
             item.setOrderEncasementId(dto.getId());
-
             BigDecimal netWeight = ObjectUtil.defaultIfNull(bomSpecMap.get(item.getBomSpecId()).getNetWeight(), BigDecimal.ZERO);
             dto.setNetWeight(dto.getNetWeight().add(netWeight));
         });
-        return verifiedQuantity(dto.getOrderId());
+        return verifiedQuantityAndGetDetail(dto.getOrderId());
     }
 
     /**
-     * 验证数量
+     * 验证数量并获取明细
      */
-    private AssemblyDetailVo verifiedQuantity(Long orderId) {
+    private AssemblyDetailVo verifiedQuantityAndGetDetail(Long orderId) {
         AssemblyDetailVo assemblyDetailVo = assemblyDetail(orderId);
         List<AssemblyDetailVo.SkuInfo> skuInfoList = assemblyDetailVo.getSkuInfoList();
         for (AssemblyDetailVo.SkuInfo skuInfo : skuInfoList) {

sd-cainiao/src/main/java/com/sd/cainiao/entity/dto/ItemParamDto.java

@@ -16,4 +16,5 @@ public class ItemParamDto {
      * 商品数量
      */
     private Integer itemCount;
+
 }

sd-cainiao/src/main/java/com/sd/cainiao/service/impl/IsticeServiceImpl.java

@@ -10,7 +10,7 @@ public class IsticeServiceImpl implements IsticeService {
 
     @Override
     public List<Map<String, Object>> takeNumBatch(List<TakeNumParamDto> dto) {
-
+        //
         // List<Map<String, Object>> resultList = new ArrayList<>();
         //
         // for (TakeNumParamDto takeNumParam : dto) {
@@ -55,9 +55,7 @@ public class IsticeServiceImpl implements IsticeService {
         //     // 批量取号
         //     List<JSONObject> list = new ArrayList<>();
         //     for (ExpressPacking e : newExpressPackingList) {
-        //         // 赋值重量体积
-        //         //                takeNumParam.setWeight(Long.parseLong(e.getNetWeight().toString()));
-        //         //                takeNumParam.setVolume(Long.parseLong(e.getBulking().toString()));
+        //
         //         takeNumParam.setOrderNum(IdUtils.dateUUID());
         //         takeNumParam.setObjectId(IdUtils.dateUUID());
         //         // 赋值产品信息
@@ -73,10 +71,17 @@ public class IsticeServiceImpl implements IsticeService {
         //                 itemParamList.add(itemParam);
         //                 takeNumParam.setItems(itemParamList);
         //             }
+        //
+        //
+        //
         //             TmsWaybillGetResponse response = this.takeNum(takeNumParam);
         //             WaybillCloudPrintResponse printResponse = response.getWaybillCloudPrintResponseList().get(0);
         //             String re = printResponse.getPrintData();
         //             JSONObject jsonObject = JSONObject.parseObject(re);
+        //
+        //
+        //
+        //
         //             // 赋值订单号
         //             List<String> stringList = new ArrayList<>();
         //             ExpressPacking dataPack = iExpressPackingService.getById(e.getId());