commit

PddServer/src/main/java/org/ta/pddserver/controller/PddOpenController.java

@@ -166,17 +166,23 @@ public class PddOpenController {
                             // 按照所有包裹计算重量，计算运费
                             List<LogOrderMailDetailEntity> mailDetailEntityList = orderMailDetailImpl.getListByCode(orderCode);
                             for (LogOrderMailDetailEntity mailDetailEntity : mailDetailEntityList) {
-                                weight += PddJYPriceTool.calculateWeight(mailDetailEntity.getLength(),
+
+                                log.info("mailNo:{} weight:{}", mailDetailEntity.getMailNo(), mailDetailEntity.getWeight());
+                                long currWeight = PddJYPriceTool.calculateWeight(mailDetailEntity.getLength(),
                                         mailDetailEntity.getWidth(),
                                         mailDetailEntity.getHeight(),
                                         mailDetailEntity.getWeight(),
                                         "SENDTORECEVER".equals(queryRequest.getSegmentCode()));
+                                log.info("mailNo:{} weight:{}, fee:{}", mailDetailEntity.getMailNo(), currWeight);
+                                weight += currWeight;
                             }
                             freightFee = PddJYPriceTool.calculateFreightFee(weight,
                                     queryRequest.getGoodsType(),
                                     1,
                                     "SENDTORECEVER".equals(queryRequest.getSegmentCode())
                             );
+                            log.info("weight:{}, fee:{}", weight, freightFee);
+
                         }
                     }
 
@@ -604,6 +610,8 @@ public class PddOpenController {
 
         //最新详情列表
         List<PddServiceConsoOrderUpdateRequest.MailDetail> listNew = updateRequest.getMailDetails();
+        List<PddServiceConsoOrderUpdateRequest.MailDetail> deleteList = new ArrayList<>();
+        List<PddServiceConsoOrderUpdateRequest.MailDetail> addList = new ArrayList<>();
 
         //根据集运单号获取运单详情列表
         List<LogOrderMailDetailEntity> list = orderMailDetailImpl.getListByCode(orderUpdateEntity.getLogisticsOrderCode());