commit

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

@@ -44,6 +44,11 @@ public class PddLocalController {
     @Resource
     TimeTool timeTool;
 
+    @Resource
+    CollectOutMailDetailImpl  collectOutMailDetailImpl;
+
+    @Resource
+    CollectOrderSendImpl  collectOrderSendImpl;
 
     @Resource
     LogOrderIoImpl logOrderIoImpl;
@@ -65,20 +70,27 @@ public class PddLocalController {
     /*集运单列表*/
     @PostMapping("/logOrderList")
     public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
-        return JsonResponse.generateLocalCommonSuccessResponse( logOrderImpl.getListByRequest(logOrderListRequest));
-    }
 
+        List<LogOrderListResponse> list = logOrderImpl.getListByRequest(logOrderListRequest.getLogisticsOrderCode());
+
+        return JsonResponse.generateLocalCommonSuccessResponse(list);
+    }
 
     /*包裹列表*/
     @PostMapping("/logOrderMailDetailList")
     public JSONObject logOrderMailDetailList(HttpServletRequest request, @RequestBody LogOrderMailDetailListRequest logOrderMailDetailListRequest) {
-        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest));
+
+        List<LogOrderMailDetailListResponse> list = logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest.getLogisticsOrderCode(), logOrderMailDetailListRequest.getMailNo());
+
+        return JsonResponse.generateLocalCommonSuccessResponse(list);
     }
 
     /*运单号查询*/
     @PostMapping("/mailNoSelect")
     public JSONObject mailNoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
+
         MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo(), mailNoRequest.getStatus());
+
         return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
     }