commit

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

@@ -140,9 +140,12 @@ public class PddOpenController {
                     int rentFee = 0;
                     int weight = 0;
                     List<String> orderCodes = queryRequest.getLogisticsOrderCodes();
+                    List<PddServiceConsoFeeQueryRequest.MailDetail> queryList = queryRequest.getMailDetails();
                     for (String orderCode : orderCodes) {
+                        log.info("已合包，开始处理 {}", orderCode);
                         LogOrderEntity logOrderEntity = orderImpl.getByOrderCode(orderCode);
                         if (logOrderEntity.getStatus() >= 50) {
+                            log.info("已合包，开始处理");
                             // 已合包
                             // 每个计算重量，每个计算运费
                             List<LogOrderMailDetailEntity> mailDetailEntityList = orderMailDetailImpl.getNewPackListByCode(orderCode);
@@ -153,13 +156,14 @@ public class PddOpenController {
                                         mailDetailEntity.getWeight(),
                                         "SENDTORECEVER".equals(queryRequest.getSegmentCode()));
                                 long currFee = PddJYPriceTool.calculateFreightFee(currWeight,
-                                        queryRequest.getGoodsType(),
+                                        mailDetailEntity.getPackageType(),
                                         1,
                                         "SENDTORECEVER".equals(queryRequest.getSegmentCode())
                                 );
                                 log.info("mailNo:{} weight:{}, fee:{}", mailDetailEntity.getMailNo(), currWeight, currFee);
                                 weight += currWeight;
                                 freightFee += currFee;
+
                             }
 
                         } else {
@@ -167,15 +171,18 @@ public class PddOpenController {
                             // 按照所有包裹计算重量，计算运费
                             List<LogOrderMailDetailEntity> mailDetailEntityList = orderMailDetailImpl.getListByCode(orderCode);
                             for (LogOrderMailDetailEntity mailDetailEntity : mailDetailEntityList) {
-
-                                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;
+                                for (PddServiceConsoFeeQueryRequest.MailDetail mailDetail : queryList) {
+                                    if (mailDetail.getMailNo().equals(mailDetailEntity.getMailNo())) {
+                                        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(),

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderMailDetailEntity.java

@@ -70,4 +70,7 @@ public class LogOrderMailDetailEntity {
     @TableField(value = "enterTime")
     private String enterTime;
 
+    @TableField(value = "packageType")
+    private String packageType;
+
 }

PddServer/src/main/java/org/ta/pddserver/model/api/request/OutBoundRequest.java

@@ -11,19 +11,8 @@ public class OutBoundRequest {
 
     private String orderCode;
 
-    private Long length;
+    private List<OutPackage> outPackageList;
 
-    private Long width;
-
-    private Long height;
-
-    private Long weight;
-
-    private String packageType;
-
-    private String mailNo;
-
-    private String expressCode;
 
     /**
      * 包裹详情
@@ -35,4 +24,21 @@ public class OutBoundRequest {
 
     }
 
+    @Data
+    public static class OutPackage {
+        private Long length;
+
+        private Long width;
+
+        private Long height;
+
+        private Long weight;
+
+        private String packageType;
+
+        private String mailNo;
+
+        private String expressCode;
+    }
+
 }

PddServer/src/test/java/org/ta/pddserver/CommonTest.java

@@ -291,7 +291,7 @@ public class CommonTest {
      */
     @Test
     public void finishPick() {
-        String LogisticsOrderCode = "PP25110414221207143137527";
+        String LogisticsOrderCode = "PP25110920956210797423271";
         String action = "finish_pick";
         PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
         notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
@@ -331,9 +331,9 @@ public class CommonTest {
     @Test
     public void outBound() {
 
-        String mailNo = "BK-25110414221207143137527";
-        String expressCode = "KR_JD";
-        String orderCode = "PP25110414221207143137527";
+        String mailNo = "KRJDV329857683219";
+        String expressCode = "KRJDV";
+        String orderCode = "PP25111014321660730023271";
 //        String segmentCode = "RETURNSELLER";
         String segmentCode = "SENDTORECEVER";
 
@@ -355,21 +355,21 @@ public class CommonTest {
         packageInfo0.setOutboundMailNo(mailNo + "1");
         packageInfo0.setExpressCode(expressCode);
         packageInfo0.setPackageType("2");
-        packageInfo0.setLength(30L);
+        packageInfo0.setLength(60L);
         packageInfo0.setWidth(30L);
         packageInfo0.setHeight(30L);
-        packageInfo0.setWeight(1000L);
-//        packageInfo0.setInboundMailDetails(new ArrayList<>());
-//        PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail0 = new PddServiceConsoOutboundRequest.InboundMailDetail();
-//        packageInfo0.getInboundMailDetails().add(inboundMailDetail0);
-//        inboundMailDetail0.setMailNo("773608936457954");
-//        inboundMailDetail0.setExpressCode("STO");
-//        PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail1 = new PddServiceConsoOutboundRequest.InboundMailDetail();
-//        packageInfo0.getInboundMailDetails().add(inboundMailDetail1);
-//        inboundMailDetail1.setMailNo("773010635902734");
-//        inboundMailDetail1.setExpressCode("STO");
+        packageInfo0.setWeight(2000L);
+        packageInfo0.setInboundMailDetails(new ArrayList<>());
+        PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail0 = new PddServiceConsoOutboundRequest.InboundMailDetail();
+        packageInfo0.getInboundMailDetails().add(inboundMailDetail0);
+        inboundMailDetail0.setMailNo("SF3279615820942");
+        inboundMailDetail0.setExpressCode("SF");
+        PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail1 = new PddServiceConsoOutboundRequest.InboundMailDetail();
+        packageInfo0.getInboundMailDetails().add(inboundMailDetail1);
+        inboundMailDetail1.setMailNo("SF3298576832192");
+        inboundMailDetail1.setExpressCode("SF");
+
 
-        /*
         PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
         notifyRequest.getPackageInfos().add(packageInfo);
         packageInfo.setOutboundMailNo(mailNo + "2");
@@ -378,13 +378,13 @@ public class CommonTest {
         packageInfo.setLength(30L);
         packageInfo.setWidth(30L);
         packageInfo.setHeight(30L);
-        packageInfo.setWeight(1500L);
+        packageInfo.setWeight(1000L);
         packageInfo.setInboundMailDetails(new ArrayList<>());
         PddServiceConsoOutboundRequest.InboundMailDetail inboundMailDetail2 = new PddServiceConsoOutboundRequest.InboundMailDetail();
         packageInfo.getInboundMailDetails().add(inboundMailDetail2);
-        inboundMailDetail2.setMailNo("TT773010635902734");
-        inboundMailDetail2.setExpressCode("STO");
-         */
+        inboundMailDetail2.setMailNo("SF3298576832194");
+        inboundMailDetail2.setExpressCode("SF");
+
 
         notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
         notifyRequest.getSenderDetail().setName("海际集货仓");
@@ -396,13 +396,13 @@ public class CommonTest {
         notifyRequest.getSenderDetail().setDetailAddress("山东省临沂市兰山区横九路与纵十路交汇兰山财金智慧云仓五期二层二号仓");
 
         notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
-        notifyRequest.getReceiverDetail().setName("김명상");
+        notifyRequest.getReceiverDetail().setName("김명");
         notifyRequest.getReceiverDetail().setTelePhone("01012345678");
         notifyRequest.getReceiverDetail().setCountry("KR");
-        notifyRequest.getReceiverDetail().setProvince("서울특별시");
-        notifyRequest.getReceiverDetail().setCity("강북구");
-        notifyRequest.getReceiverDetail().setDistrict("강북구");
-        notifyRequest.getReceiverDetail().setDetailAddress("护照1号");
+        notifyRequest.getReceiverDetail().setProvince("인천광역시");
+        notifyRequest.getReceiverDetail().setCity("미추홀구");
+        notifyRequest.getReceiverDetail().setDistrict("주안동");
+        notifyRequest.getReceiverDetail().setDetailAddress("符合");
 
         notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
         notifyRequest.getResult().setCode(0);
@@ -431,7 +431,7 @@ public class CommonTest {
      */
     @Test
     public void finishUnpack() {
-        String LogisticsOrderCode = "PP25110415653142528037527";
+        String LogisticsOrderCode = "PP25111014321660729723271";
         String action = "finish_unpack";
         PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
         notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
@@ -447,15 +447,25 @@ public class CommonTest {
         notifyRequest.setUnpackRemark("");
         notifyResult.setCode(0);
         notifyRequest.setPackageInfos(new ArrayList<>());
-        PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo0 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
-        notifyRequest.getPackageInfos().add(packageInfo0);
-        packageInfo0.setWeight(600L);
-        packageInfo0.setWidth(30L);
-        packageInfo0.setHeight(30L);
-        packageInfo0.setLength(30L);
-        packageInfo0.setActualWeight(600L);
-        packageInfo0.setConsoType("SEA");
-        packageInfo0.setGoodsType("NORMAL");
+        PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo1 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
+        notifyRequest.getPackageInfos().add(packageInfo1);
+        packageInfo1.setWeight(2000L);
+        packageInfo1.setWidth(30L);
+        packageInfo1.setHeight(30L);
+        packageInfo1.setLength(30L);
+        packageInfo1.setActualWeight(2000L);
+        packageInfo1.setConsoType("SEA");
+        packageInfo1.setGoodsType("SPECIAL");
+
+//        PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo0 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
+//        notifyRequest.getPackageInfos().add(packageInfo0);
+//        packageInfo0.setWeight(1000L);
+//        packageInfo0.setWidth(30L);
+//        packageInfo0.setHeight(30L);
+//        packageInfo0.setLength(30L);
+//        packageInfo0.setActualWeight(1000L);
+//        packageInfo0.setConsoType("SEA");
+//        packageInfo0.setGoodsType("SPECIAL");
 
         notifyRequest.setResult(notifyResult);
 
@@ -481,9 +491,9 @@ public class CommonTest {
      */
     @Test
     public void dereliction() {
-        String mailNo = "TT773010635902734";
-        String expressCode = "STO";
-        String dereRecogCode = "51103HHF52832";
+        String mailNo = "SF3298576832194";
+        String expressCode = "SF";
+        String dereRecogCode = "51110ANK19872";
         PddServiceConsoDerelictionRequest notifyRequest = new PddServiceConsoDerelictionRequest();
         notifyRequest.setProviderCode(PddAPIConfig.PROVIDER_CODE);
         notifyRequest.setExecuteTime(getNowString());