commit

AuthServer/src/main/resources/application.yml

@@ -58,4 +58,4 @@ mybatis-plus:
       # 默认数据库表下划线命名
       table-underline: true
 server:
-  port: 9000
+  port: 8700

AuthServer2/src/main/resources/application.yml

 server:
-  port: 9000
+  port: 8700
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -169,6 +169,8 @@ public class PddLocalController {
         logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
         logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
         logOrderMailDetailIoEntity.setResp(resp);
+
+        logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
 //        ioEntity.setReq(JSON.toJSONString(requestModel));
 //        ioEntity.setResp(resp);
 //        logOrderMailDetailIo.save(ioEntity);
@@ -179,25 +181,34 @@ public class PddLocalController {
     /*入库*/
     @PostMapping("/inBound")
     public JSONObject inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
-        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo());
-
+        LogOrderMailDetailEntity mailNoResponse = logOrderMailDetailImpl.getByMailNo(inBoundRequest.getMailNo());
 
         PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
 
         Long status = 20L;
         Long unStatus = 10L;
-
         // 查询orderNO 下所有mailNo,判断是全部还是部分
         Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), unStatus);
         Long num = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), status);
 
+        //判断是否存在入库信息
+        if(mailNoResponse.getStatus().equals(20)){
+            //重复入库
+
+            notifyRequest.setPackageQuantity(num); // 已入库数量
+        }else {
+
+            notifyRequest.setPackageQuantity(num + 1); // 已入库数量 + 1
+        }
+
+
         notifyRequest.setProviderCode(PROVIDER_CODE);
         notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
         notifyRequest.setExecuteTime(timeTool.getNowString());
         notifyRequest.setTimeZone("UTC+8");
 
         notifyRequest.setStatus("FULL_INBOUND");
-        notifyRequest.setPackageQuantity(num + 1); // 已入库数量 + 1
+
 
         notifyRequest.setPackageInfo(new PddServiceConsoInboundRequest.PackageInfo());
         notifyRequest.getPackageInfo().setMailNo(mailNoResponse.getMailNo());
@@ -232,11 +243,19 @@ public class PddLocalController {
         logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
         logOrderMailDetailIoEntity.setResp(resp);
 
+        mailNoResponse.setLength(inBoundRequest.getLength().intValue());
+        mailNoResponse.setWidth(inBoundRequest.getWidth().intValue());
+        mailNoResponse.setHeight(inBoundRequest.getHeight().intValue());
+        mailNoResponse.setWeight(inBoundRequest.getWeight().intValue());
+
+        logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
+
+
         //更新入库包裹状态
         logOrderMailDetailImpl.updateByMailNo(inBoundRequest.getMailNo(), 20);
 
         //判断是否全部入库
-        if(unNum - 1 == 0){
+        if(unNum - 1 == 0 && notifyRequest.getPackageQuantity() > num){
             //全部入库
             logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 20);
         }else {
@@ -264,17 +283,17 @@ public class PddLocalController {
 
         PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
         if (action.equals("begin_pick")) {
-            logOrderMailDetailIoEntity.setStatus(30);
+            logOrderMailDetailIoEntity.setStatus(50);
 
             notifyRequest.setBizActionDesc("开始拣货");
             notifyResult.setCode(0);
         } else if (action.equals("finish_pick")) {
-            logOrderMailDetailIoEntity.setStatus(40);
+            logOrderMailDetailIoEntity.setStatus(59);
 
             notifyRequest.setBizActionDesc("拣货完成");
             notifyResult.setCode(0);
         } else if (action.equals("finish_unpack")) {
-            logOrderMailDetailIoEntity.setStatus(50);
+            logOrderMailDetailIoEntity.setStatus(39);
 
             notifyRequest.setBizActionDesc("拆包完成");
             notifyRequest.setUnpackRemark("");
@@ -313,6 +332,8 @@ public class PddLocalController {
         logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
         logOrderMailDetailIoEntity.setResp(resp);
 
+        logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
+
         return JsonResponse.generateLocalCommonSuccessResponse(true);
 
     }
@@ -421,6 +442,8 @@ public class PddLocalController {
         logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
         logOrderMailDetailIoEntity.setResp(resp);
 
+        logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
+
         //更新collect_mail_detail
         for(CollectOutMailDetailResponse lists: list) {
             Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailMapper.java

@@ -32,7 +32,7 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
 
 
 
-    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
+    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated`, `status` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
     MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo);
 
     @Update("UPDATE `log_order_mail_detail` SET `status` = ${status} WHERE `mailNo` = #{mailNo};")

PddServer/src/main/java/org/ta/pddserver/model/api/response/MailNoResponse.java

@@ -10,4 +10,5 @@ public class MailNoResponse {
     private String expressCode;
     private String mailNo;
     private String updated;
+    private String status;
 }

PddServer/src/main/resources/application.yaml

 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-    username: root
-    password: root
-#    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-#    username: pdd
-#    password: pdd123
+#    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: root
+#    password: root
+    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    username: pdd
+    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数
@@ -17,4 +17,4 @@ spring:
   application:
     name: PddServer
 server:
-  port: 9000
+  port: 8700
\ No newline at end of file