commit

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

@@ -31,6 +31,7 @@ import org.ta.pddserver.utils.ImageUtils;
 import org.ta.pddserver.utils.JsonResponse;
 import org.ta.pddserver.utils.PddHttpTool;
 import org.ta.pddserver.utils.PddSignTool;
+import org.ta.pddserver.xxl.GDOperator;
 
 import java.io.IOException;
 import java.util.*;
@@ -51,6 +52,9 @@ public class PddGDController {
     @Resource
     GDReplyImpl gdReplyImpl;
 
+    @Resource
+    GDOperator gdOperator;
+
     /*工单列表*/
     @PostMapping("/ticketList")
     public JSONObject ticketList(HttpServletRequest request, @RequestBody TicketListRequest ticketListRequest) {
@@ -63,7 +67,7 @@ public class PddGDController {
         Map<String, Object> map = new HashMap<>();
 
         GDTicketEntity gdTicketEntity = gdTicketImpl.getByTicketId((long) ticketListRequest.getTicket_id());
-        if(gdTicketEntity == null){
+        if (gdTicketEntity == null) {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "信息获取失败，请检查上传信息");
         }
 
@@ -106,7 +110,7 @@ public class PddGDController {
     public JSONObject reply(HttpServletRequest request, @RequestBody GDTicketReplyRequest replyRequest) {
         GDTicketEntity gdTicketEntity = gdTicketImpl.getByTicketId(replyRequest.getTicket_id());
 
-       if(gdTicketEntity == null){
+        if (gdTicketEntity == null) {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "信息获取失败，请检查上传信息");
         }
 
@@ -141,7 +145,7 @@ public class PddGDController {
         JSONObject respObject = respObj.getJSONObject("logistics_ticket_notify_response");
         if (respObject == null) {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "未收到回复");
-        }else{
+        } else {
             GDTicketReplyRepsonse replyRepsonse = respObject.toJavaObject(GDTicketReplyRepsonse.class);
             log.info("replyRepsonse is_success:{}", replyRepsonse.getIs_success());
             GDReplyEntity gdReply = new GDReplyEntity();
@@ -159,7 +163,7 @@ public class PddGDController {
 
             gdReplyImpl.save(gdReply);
             if (list != null) {
-                for(String lists: list){
+                for (String lists : list) {
                     GDReplyAttachmentEntity gdReplyAttachmentEntity = new GDReplyAttachmentEntity();
                     gdReplyAttachmentEntity.setTicket_id(replyRequest.getTicket_id());
                     gdReplyAttachmentEntity.setWaybill_no(replyRequest.getWaybill_no());
@@ -176,4 +180,10 @@ public class PddGDController {
 
     }
 
+    @PostMapping("/ticketFresh")
+    public JSONObject freshFromPdd(HttpServletRequest request) {
+        gdOperator.getGdTickets();
+        return JsonResponse.generateLocalCommonSuccessResponse("OK");
+    }
+
 }

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

@@ -412,6 +412,7 @@ public class PddOpenController {
             orderMailDetail.setLogisticsOrderCode(orderCreateEntity.getLogisticsOrderCode());
             orderMailDetail.setExpressCode(mailDetail.getExpressCode());
             orderMailDetail.setMailNo(mailDetail.getMailNo());
+            orderMailDetail.setStatus(1);
             orderMailDetailImpl.save(orderMailDetail);
         }
 
@@ -641,6 +642,7 @@ public class PddOpenController {
             orderMailDetailEntity.setLogisticsOrderCode(orderUpdateEntity.getLogisticsOrderCode());
             orderMailDetailEntity.setExpressCode(mailDetail.getExpressCode());
             orderMailDetailEntity.setMailNo(mailDetail.getMailNo());
+            orderMailDetailEntity.setStatus(1);
             orderMailDetailImpl.save(orderMailDetailEntity);
         }
 

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

@@ -22,7 +22,7 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
     CollectOrderResponse findByOrderCode(String orderCode);
 
     @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
-    int updateOrderStatusById(int status, String uid);
+    int updateOrderStatusById(@Param("status")int status, @Param("uid")String uid);
 
     @Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode} AND `status` = ${status}")
     List<CollectOrderListResponse> getList(@Param("orderCode") String orderCode, @Param("status") int status);

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

@@ -29,7 +29,7 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
     @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `log_order_mail_detail` a WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%'  AND `state` > 0  ) t")
     Integer countUsable(LogOrderMailDetailListRequest param);
 
-    @Select("SELECT `uid`,`updated`,`status`,`logisticsOrderCode` , `expressCode` , `mailNo`, `length` , `width` , `height`, `weight` FROM `log_order_mail_detail` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%'  AND `state` > 0 ORDER BY uid DESC LIMIT #{offset}, #{size};")
+    @Select("SELECT `uid`,`updated`,`status`,`logisticsOrderCode` , `expressCode` , `mailNo`, `length` , `width` , `height`, `weight` FROM `log_order_mail_detail` WHERE `logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%' AND `status` = #{status}  AND `state` > 0 ORDER BY uid DESC LIMIT #{offset}, #{size};")
     List<LogOrderMailDetailListResponse> getListByCodeNo(LogOrderMailDetailListRequest param);
 
 

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

+package org.ta.pddserver.model.api.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class DerelictionRequest {
+    @Schema(
+            description = "快递单号",
+            example = "STO12345678",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private String mailNo;
+
+    @Schema(
+            description = "快递公司代码",
+            example = "STO",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private String expressCode;
+
+    @Schema(
+            description = "主件识别码，包裹上二维码识别获得，##之间的部分",
+            example = "51110ANK19872",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private String dereRecogCode;
+}

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

@@ -114,6 +114,14 @@ public class OutBoundRequest {
                 requiredMode = Schema.RequiredMode.REQUIRED // 必填
         )
         private String expressCode;
+
+        @Schema(
+                description = "包裹关联原快递包裹单号，多拆少时必填",
+                example = "[\"SF000001\"]",
+                defaultValue = "",
+                requiredMode = Schema.RequiredMode.NOT_REQUIRED // 非必填
+        )
+        private List<String> outBound;
     }
 
     @Data

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

+package org.ta.pddserver.model.api.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ProblemOrderNotifyRequest {
+    @Schema(
+            description = "快递单号",
+            example = "STO12345678",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private String mailNo;
+
+    @Schema(
+            description = "快递公司代码",
+            example = "STO",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private String expressCode;
+
+    @Schema(
+            description = "异常代码",
+            example = "1",
+            defaultValue = "",
+            requiredMode = Schema.RequiredMode.REQUIRED // 必填
+    )
+    private Integer reasonCode;
+}

PddServer/src/main/java/org/ta/pddserver/model/enums/OrderProblemType.java

@@ -24,4 +24,12 @@ public enum OrderProblemType {
         this.desc = desc;
     }
 
+    public static OrderProblemType verify(Integer reasonCode) {
+        for (OrderProblemType orderProblemType : OrderProblemType.values()) {
+            if (orderProblemType.value == reasonCode) {
+                return orderProblemType;
+            }
+        }
+        return null;
+    }
 }

PddServer/src/main/java/org/ta/pddserver/utils/TimeTool.java

@@ -7,16 +7,15 @@ import org.springframework.stereotype.Component;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-@Component
 public class TimeTool {
 
-    public String getNowString() {
+    public static String getNowString() {
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.format(date);
     }
 
-    public String getNowDate() {
+    public static  String getNowDate() {
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return sdf.format(date);

PddServer/src/main/java/org/ta/pddserver/xxl/GDOperator.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 @Component
 @Slf4j
-@EnableScheduling
+//@EnableScheduling
 public class GDOperator {
 
     @Resource
@@ -27,7 +27,7 @@ public class GDOperator {
     @Autowired
     private GDAttachmentImpl gDAttachmentImpl;
 
-    @Scheduled(fixedRate = 1000 * 60 * 5, initialDelay = 1000) // 每5分钟执行一次
+//    @Scheduled(fixedRate = 1000 * 60 * 5, initialDelay = 1000) // 每5分钟执行一次
     public void getGdTickets() {
         List<GDTicketRepsonse> list = PddGDUtil.getTickets();
         log.info("{} 工单数量：{}", new Date().toLocaleString(), list.size());
@@ -38,34 +38,34 @@ public class GDOperator {
                 // 主体、绑定两个表
                 gdTicketEntity = new GDTicketEntity();
                 gdTicketEntity.setTicket_id(gdTicketRepsonse.getTicket_id());
-//                gdTicketEntity.setCreate_type(gdTicketRepsonse.getCreate_type());
-//                gdTicketEntity.setReceive_address(gdTicketRepsonse.getReceive_address());
-//                gdTicketEntity.setSend_address(gdTicketRepsonse.getSend_address());
-//                gdTicketEntity.setPre_delivery_id(gdTicketRepsonse.getPre_delivery_id());
-//                gdTicketEntity.setHandle_result(gdTicketRepsonse.getHandle_result());
-//                gdTicketEntity.setExpress_company_id((long)gdTicketRepsonse.getExpress_company_id());
-//                gdTicketEntity.setCompensate_state((int)gdTicketRepsonse.getCompensate_state());
-//                gdTicketEntity.setCompensate_amount(gdTicketRepsonse.getCompensate_amount().intValue());
-//                gdTicketEntity.setSign_state((int)gdTicketRepsonse.getSign_state());
-//                gdTicketEntity.setExpress_dealer(gdTicketRepsonse.getExpress_dealer());
-//                gdTicketEntity.setExpress_dealer_contact(gdTicketRepsonse.getExpress_dealer_contact());
-//                gdTicketEntity.setRetreat_count(gdTicketRepsonse.getRetreat_count());
-//                gdTicketEntity.setReceive_name(gdTicketRepsonse.getReceive_name());
-//                gdTicketEntity.setReceive_contact(gdTicketRepsonse.getReceive_contact());
+                gdTicketEntity.setCreate_type(gdTicketRepsonse.getCreate_type());
+                gdTicketEntity.setReceive_address(gdTicketRepsonse.getReceive_address());
+                gdTicketEntity.setSend_address(gdTicketRepsonse.getSend_address());
+                gdTicketEntity.setPre_delivery_id(gdTicketRepsonse.getPre_delivery_id());
+                gdTicketEntity.setHandle_result(gdTicketRepsonse.getHandle_result());
+                gdTicketEntity.setExpress_company_id((long)gdTicketRepsonse.getExpress_company_id());
+                gdTicketEntity.setCompensate_state((int)gdTicketRepsonse.getCompensate_state());
+                gdTicketEntity.setCompensate_amount(gdTicketRepsonse.getCompensate_amount().intValue());
+                gdTicketEntity.setSign_state((int)gdTicketRepsonse.getSign_state());
+                gdTicketEntity.setExpress_dealer(gdTicketRepsonse.getExpress_dealer());
+                gdTicketEntity.setExpress_dealer_contact(gdTicketRepsonse.getExpress_dealer_contact());
+                gdTicketEntity.setRetreat_count(gdTicketRepsonse.getRetreat_count());
+                gdTicketEntity.setReceive_name(gdTicketRepsonse.getReceive_name());
+                gdTicketEntity.setReceive_contact(gdTicketRepsonse.getReceive_contact());
 
                 gdTicketEntity.setCreate_at(gdTicketRepsonse.getCreated_at());
                 gdTicketEntity.setUpdate_at(gdTicketRepsonse.getUpdated_at());
-//                gdTicketEntity.setTitle(gdTicketRepsonse.getTitle());
-//                gdTicketEntity.setDescription(gdTicketRepsonse.getDescription());
-//                gdTicketEntity.setSource(gdTicketRepsonse.getSource());
+                gdTicketEntity.setTitle(gdTicketRepsonse.getTitle());
+                gdTicketEntity.setDescription(gdTicketRepsonse.getDescription());
+                gdTicketEntity.setSource(gdTicketRepsonse.getSource());
                 gdTicketEntity.setWaybill_no(gdTicketRepsonse.getWaybill_no());
-//                gdTicketEntity.setUrgent_type(gdTicketRepsonse.getUrgent_type());
-//                gdTicketEntity.setType_id(gdTicketRepsonse.getType_id());
-//                gdTicketEntity.setStatus(gdTicketRepsonse.getStatus());
-//                gdTicketEntity.setCabinet_code(gdTicketRepsonse.getCabinet_code());
-//                gdTicketEntity.setMail_order_sn(gdTicketRepsonse.getMail_order_sn());
-//                gdTicketEntity.setPay_amount(gdTicketRepsonse.getPay_amount());
-//                gdTicketEntity.setArea_name(gdTicketRepsonse.getArea_name());
+                gdTicketEntity.setUrgent_type(gdTicketRepsonse.getUrgent_type());
+                gdTicketEntity.setType_id(gdTicketRepsonse.getType_id());
+                gdTicketEntity.setStatus(gdTicketRepsonse.getStatus());
+                gdTicketEntity.setCabinet_code(gdTicketRepsonse.getCabinet_code());
+                gdTicketEntity.setMail_order_sn(gdTicketRepsonse.getMail_order_sn());
+                gdTicketEntity.setPay_amount(gdTicketRepsonse.getPay_amount());
+                gdTicketEntity.setArea_name(gdTicketRepsonse.getArea_name());
 
                 gdTicketImpl.save(gdTicketEntity);
 

PddServer/src/main/resources/application.yaml

@@ -4,13 +4,13 @@ spring:
 #    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_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-    username: pdd
-    password: pdd123
-
-#    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
 #    username: pdd
 #    password: pdd123
+
+    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    username: pdd
+    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数
@@ -21,7 +21,8 @@ spring:
   application:
     name: PddServer
 server:
-  port: 8600
+#  port: 9000 # 正式端口号
+  port: 8600 # 测试端口号
 logging:
   level:
     org: