项目完善

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

@@ -62,35 +62,22 @@ public class PddLocalController {
     @Autowired
     private CollectMailDetailImpl collectMailDetailImpl;
 
-    @Resource
-    CollectOutMailDetailImpl  collectOutMailDetailImpl;
-
-    @Resource
-    CollectOrderSendImpl  collectOrderSendImpl;
     /*集运单列表*/
     @PostMapping("/logOrderList")
     public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
-
-        List<LogOrderListResponse> list = logOrderImpl.getListByRequest(logOrderListRequest.getLogisticsOrderCode());
-
-        return JsonResponse.generateLocalCommonSuccessResponse(list);
+        return JsonResponse.generateLocalCommonSuccessResponse( logOrderImpl.getListByRequest(logOrderListRequest));
     }
 
     /*包裹列表*/
     @PostMapping("/logOrderMailDetailList")
     public JSONObject logOrderMailDetailList(HttpServletRequest request, @RequestBody LogOrderMailDetailListRequest logOrderMailDetailListRequest) {
-
-        List<LogOrderMailDetailListResponse> list = logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest.getLogisticsOrderCode(), logOrderMailDetailListRequest.getMailNo());
-
-        return JsonResponse.generateLocalCommonSuccessResponse(list);
+        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest));
     }
 
     /*运单号查询*/
     @PostMapping("/mailNoSelect")
     public JSONObject mailNoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
-
         MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo(), mailNoRequest.getStatus());
-
         return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
     }
 
@@ -287,16 +274,6 @@ public class PddLocalController {
     public void outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) {
         PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
 
-
-/*
-        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
-        ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
-        ioEntity.setExpressCode(mailNoResponse.getExpressCode());
-        ioEntity.setMailNo(mailNoResponse.getMailNo());
-        ioEntity.setStatus(50);
-*/
-
-
         notifyRequest.setProviderCode(PROVIDER_CODE);
         notifyRequest.setOrderCode(outBoundRequest.getOrderCode());
         notifyRequest.setSegmentCode(outBoundRequest.getSegmentCode());

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: zyeasy
-    password: zyeasy2021
-    #    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/Test01?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  # 最大活跃连接数