commit

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

@@ -13,10 +13,7 @@ import org.ta.pddserver.model.api.request.*;
 import org.ta.pddserver.model.api.response.*;
 import org.ta.pddserver.model.pddjy.request.*;
 import org.ta.pddserver.service.impl.*;
-import org.ta.pddserver.utils.JsonResponse;
-import org.ta.pddserver.utils.PddHttpTool;
-import org.ta.pddserver.utils.PddSignTool;
-import org.ta.pddserver.utils.TimeTool;
+import org.ta.pddserver.utils.*;
 
 import java.util.*;
 
@@ -41,7 +38,7 @@ public class PddLocalController {
     CollectOrderSendImpl  collectOrderSendImpl;
 
     @Resource
-    LogOrderMailDetailIoImpl logOrderMailDetailIo;
+    LogOrderMailDetailIoImpl logOrderMailDetailIoImpl;
 
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
@@ -70,11 +67,34 @@ public class PddLocalController {
     /*运单号查询*/
     @PostMapping("/mailNoSelect")
     public JSONObject mailNoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
-        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo(), mailNoRequest.getStatus());
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
         return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
     }
 
-       /*运单号获取所有出库单信息*/
+    /*出库列表*/
+    @PostMapping("/collectMailDetailList")
+    public JSONObject collectMailDetailList(HttpServletRequest request, @RequestBody CollectMailDetailListRequest collectMailDetailListRequest) {
+
+        return JsonResponse.generateLocalCommonSuccessResponse(collectMailDetailImpl.getList(collectMailDetailListRequest));
+    }
+
+
+    /*出库扫码*/
+    @PostMapping("/collectOrderScan")
+    public Map collectOrderScan(HttpServletRequest request, @RequestBody CollectOrderScanRequest collectOrderScanRequest) {
+
+        Map<String, Object> map = new HashMap<>();
+
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getInfoByOrderCode(collectOrderScanRequest.getOrderCode());
+        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOrderScanRequest.getOrderCode());
+
+        map.put("collectOrder", collectOrderResponse);
+        map.put("list", list);
+
+        return JsonResponse.generateLocalCommonSuccessResponse(map);
+    }
+
+    /*待拣包裹列表接口*/
     @PostMapping("/mailNoSelectAll")
     public Map mailNoSelectAll(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
         Map<String, Object> map = new HashMap<>();
@@ -93,9 +113,8 @@ public class PddLocalController {
 
     /*签收*/
     @PostMapping("/receive")
-    public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
-        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus());
-
+    public JSONObject receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo());
 
         String action = receiveRequest.getAction();
 
@@ -109,18 +128,23 @@ public class PddLocalController {
         notifyRequest.setMailNo(mailNoResponse.getMailNo());
         notifyRequest.setExpressCode(mailNoResponse.getExpressCode());
 
-        if (action == "warehouse_sign") {
+        LogOrderMailDetailIoEntity  logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+
+        if (action.equals("warehouse_sign")) {
             notifyRequest.setBizActionDesc("仓库签收");
             notifyResult.setCode(0);
-        } else if (action == "warehouse_reject_sign") {
+            logOrderMailDetailIoEntity.setStatus(10);
+        } else if (action.equals("warehouse_reject_sign")) {
             notifyRequest.setBizActionDesc("仓库拒签");
             notifyResult.setCode(22);
             notifyResult.setDesc("运输品类限制");
             notifyResult.setRemark("运输品类限制");
             notifyRequest.setResult(notifyResult);
-        } else if (action == "destroy") {
+            logOrderMailDetailIoEntity.setStatus(11);
+        } else if (action.equals("destroy")) {
             notifyRequest.setBizActionDesc("包裹销毁");
             notifyResult.setCode(0);
+            logOrderMailDetailIoEntity.setStatus(12);
         }
 
         notifyRequest.setResult(notifyResult);
@@ -137,23 +161,31 @@ public class PddLocalController {
         String resp = PddHttpTool.sendJsonPost(requestModel);
 
         //更新log_order_mail_detail
-        Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), action);
+        Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), logOrderMailDetailIoEntity.getStatus());
 
+        logOrderMailDetailIoEntity.setMailNo(receiveRequest.getMailNo());
+
+        logOrderMailDetailIoEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
+        logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+        logOrderMailDetailIoEntity.setResp(resp);
 //        ioEntity.setReq(JSON.toJSONString(requestModel));
 //        ioEntity.setResp(resp);
 //        logOrderMailDetailIo.save(ioEntity);
+
+        return JsonResponse.generateLocalCommonSuccessResponse(true);
     }
 
     /*入库*/
     @PostMapping("/inBound")
-    public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
-        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus());
+    public JSONObject inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo());
 
 
         PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
 
-        Long status = 0L;
-        Long unStatus = 0L;
+        Long status = 20L;
+        Long unStatus = 10L;
 
         // 查询orderNO 下所有mailNo,判断是全部还是部分
         Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), unStatus);
@@ -191,23 +223,33 @@ public class PddLocalController {
         requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
         String resp = PddHttpTool.sendJsonPost(requestModel);
 
+        LogOrderMailDetailIoEntity  logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+        logOrderMailDetailIoEntity.setMailNo(inBoundRequest.getMailNo());
+        logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
+        logOrderMailDetailIoEntity.setStatus(20);
+        logOrderMailDetailIoEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
+        logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+        logOrderMailDetailIoEntity.setResp(resp);
+
         //更新入库包裹状态
-//
-//        ioEntity.setReq(JSON.toJSONString(requestModel));
-//        ioEntity.setResp(resp);
-//        logOrderMailDetailIo.save(ioEntity);
+        logOrderMailDetailImpl.updateByMailNo(inBoundRequest.getMailNo(), 20);
 
         //判断是否全部入库
         if(unNum - 1 == 0){
             //全部入库
-            logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 0);
+            logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 20);
+        }else {
+            logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 21);
         }
+
+        return JsonResponse.generateLocalCommonSuccessResponse(true);
     }
 
     /*收到拆包通知后 完成拆包*/
     @PostMapping("/finishUnpack")
-    public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
-        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus());
+    public JSONObject finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo());
 
         String action = finishUnpackRequest.getAction();
 
@@ -218,19 +260,21 @@ public class PddLocalController {
         notifyRequest.setExecuteTime(timeTool.getNowString());
         notifyRequest.setTimeZone("UTC+8");
 
+        LogOrderMailDetailIoEntity  logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+
         PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
-        if (action == "begin_pick") {
-//            ioEntity.setStatus(30);
+        if (action.equals("begin_pick")) {
+            logOrderMailDetailIoEntity.setStatus(30);
 
             notifyRequest.setBizActionDesc("开始拣货");
             notifyResult.setCode(0);
-        } else if (action == "finish_pick") {
-//            ioEntity.setStatus(40);
+        } else if (action.equals("finish_pick")) {
+            logOrderMailDetailIoEntity.setStatus(40);
 
             notifyRequest.setBizActionDesc("拣货完成");
             notifyResult.setCode(0);
-        } else if (action == "finish_unpack") {
-//            ioEntity.setStatus(50);
+        } else if (action.equals("finish_unpack")) {
+            logOrderMailDetailIoEntity.setStatus(50);
 
             notifyRequest.setBizActionDesc("拆包完成");
             notifyRequest.setUnpackRemark("");
@@ -248,7 +292,6 @@ public class PddLocalController {
         }
         notifyRequest.setResult(notifyResult);
 
-
         JYBaseRequestModel requestModel = new JYBaseRequestModel();
         requestModel.setRequest(JSON.toJSONString(notifyRequest));
         requestModel.setRequest_id("" + new Date().getTime());
@@ -261,11 +304,17 @@ public class PddLocalController {
         String resp = PddHttpTool.sendJsonPost(requestModel);
 
         //更新collect_mail_detail
-        Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), action);
+        Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), logOrderMailDetailIoEntity.getStatus());
+
+        logOrderMailDetailIoEntity.setMailNo(finishUnpackRequest.getMailNo());
+        logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
+        logOrderMailDetailIoEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        logOrderMailDetailIoEntity.setExpressCode(mailNoResponse.getExpressCode());
+        logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+        logOrderMailDetailIoEntity.setResp(resp);
+
+        return JsonResponse.generateLocalCommonSuccessResponse(true);
 
-//        ioEntity.setReq(JSON.toJSONString(requestModel));
-//        ioEntity.setResp(resp);
-//        logOrderMailDetailIo.save(ioEntity);
     }
 
     /*拣货完成后出库*/
@@ -277,15 +326,25 @@ public class PddLocalController {
 
         //获取所有可出库订单
         List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
+
+        // 存储需要删除的元素
+        List<CollectOutMailDetailResponse> toRemoveList = new ArrayList<>();
+        List<OutBoundRequest.OutBoundList> toRemoveOutBound = new ArrayList<>();
+
+
         for(CollectOutMailDetailResponse lists: list){
             for(OutBoundRequest.OutBoundList outBoundLists: outBoundList ){
                 if(lists.getMailNo().equals(outBoundLists.getMailNo())){
-                    list.remove(outBoundList);
-                    outBoundRequest.getOutBound().remove(outBoundList);
+                    toRemoveList.add(lists);
+                    toRemoveOutBound.add(outBoundLists);
                 }
             }
         }
 
+        list.removeAll(toRemoveList);
+        outBoundList.removeAll(toRemoveOutBound);
+
+
         if(list.size()>0 || outBoundList.size() > 0){
             //出库信息与已存信息不匹配，无法出库
 
@@ -352,14 +411,28 @@ public class PddLocalController {
         requestModel.setTimestamp(time);
         requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
         String resp = PddHttpTool.sendJsonPost(requestModel);
-        return null;
+
+        LogOrderMailDetailIoEntity  logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+        logOrderMailDetailIoEntity.setMailNo(outBoundRequest.getMailNo());
+        logOrderMailDetailIoEntity.setExpressCode(outBoundRequest.getExpressCode());
+        logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
+        logOrderMailDetailIoEntity.setExpressCode(outBoundRequest.getExpressCode());
+        logOrderMailDetailIoEntity.setStatus(60);
+        logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+        logOrderMailDetailIoEntity.setResp(resp);
+
+        //更新collect_mail_detail
+        for(CollectOutMailDetailResponse lists: list) {
+            Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
+        }
+        return JsonResponse.generateLocalCommonSuccessResponse(true);
     }
 
 
     /*流水查询*/
     @PostMapping("/logOrderMailDetailIoSelect")
     public JSONObject logOrderMailDetailIoSelect(HttpServletRequest request, @RequestBody LogOrderMailDetailIoRequest param) {
-        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailIo.getListByRequest(param));
+        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailIoImpl.getListByRequest(param));
     }
 
 }

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

@@ -6,6 +6,12 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.ta.pddserver.entity.CollectMailDetailEntity;
+import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
+import org.ta.pddserver.model.api.request.LogOrderListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
+import org.ta.pddserver.model.api.response.LogOrderListResponse;
+
+import java.util.List;
 
 @Mapper
 public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEntity> {
@@ -15,6 +21,14 @@ public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEnt
     @Update("UPDATE `collect_mail_detail` SET `status` = #{status} WHERE `uid` = #{uid};")
     int updateStatusByUid(int status, String uid);
 
-    @Update("UPDATE `collect_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo}")
-    Boolean updateByMailNo(@Param("mailNo") String mailNo, @Param("action") String action);
+    @Update("UPDATE `collect_mail_detail` SET `status` = #{status} WHERE `mailNo` = #{mailNo}")
+    Boolean updateByMailNo(@Param("mailNo") String mailNo, @Param("status") int status);
+
+
+
+    @Select("SELECT count(*) FROM `collect_mail_detail` WHERE `orderCode` LIKE '%${orderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%';")
+    Integer countUsable(CollectMailDetailListRequest collectMailDetailListRequest);
+
+    @Select("SELECT `uid`, `orderCode`, `expressCode`, `mailNo` FROM `collect_mail_detail` WHERE `orderCode` LIKE '%${orderCode}%' AND `mailNo` LIKE '%${mailNo}%' AND `status` LIKE '%${status}%' ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
+    List<CollectMailDetailListResponse> getListByRequest(CollectMailDetailListRequest collectMailDetailListRequest);
 }

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

@@ -2,11 +2,15 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.ta.pddserver.entity.CollectOrderEntity;
+import org.ta.pddserver.model.api.response.CollectOrderListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderResponse;
 
+import java.util.List;
+
 @Mapper
 public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
@@ -15,4 +19,10 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
     @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
     int updateOrderStatusById(int status, 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);
+
+    @Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    CollectOrderResponse getInfoByOrderCode(@Param("orderCode") String orderCode);
 }

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

@@ -24,19 +24,19 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
     LogOrderMailDetailEntity findByMailNo(String mailNo);
 
 
-    @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `log_order_mail_detail` a WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  AND `mailNo` LIKE '%${mailNo}%'   AND `state` > 0  ) t")
+    @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 `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` LIKE '%${status}%'  AND `state` > 0 ORDER BY uid DESC LIMIT #{offset}, #{size};")
     List<LogOrderMailDetailListResponse> getListByCodeNo(LogOrderMailDetailListRequest param);
 
 
 
-    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} AND `status` = #{status} AND `state` > 0;")
-    MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo, @Param("status") String status);
+    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
+    MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo);
 
-    @Update("UPDATE `log_order_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo};")
-    Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("action") String action);
+    @Update("UPDATE `log_order_mail_detail` SET `status` = ${status} WHERE `mailNo` = #{mailNo};")
+    Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("status") int status);
 
     @Select("SELECT COUNT(*) FROM  `log_order_mail_detail` WHERE `logisticsOrderCode` = #{logisticsOrderCode} AND `status` = ${status};")
     Long getSumByCodeStatus(@Param("logisticsOrderCode") String logisticsOrderCode, @Param("status") Long status);

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class CollectMailDetailListRequest extends PageTool {
+
+    private String orderCode;
+
+    private String mailNo;
+
+    private int status;
+}

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+
+@Data
+public class CollectOrderScanRequest {
+
+    private String orderCode;
+}

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

@@ -9,4 +9,6 @@ public class LogOrderMailDetailListRequest  extends PageTool {
     private String logisticsOrderCode;
 
     private String mailNo;
+
+    private int status;
 }

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

@@ -9,6 +9,6 @@ public class ReceiveRequest {
 
     private String mailNo;
 
-    private String status;
+    private int status;
 
 }

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

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectMailDetailListResponse {
+
+    private String uid;
+
+    private String orderCode;
+
+    private int status;
+
+    private String expressCode;
+
+    private String mailNo;
+
+}

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

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectOrderListResponse {
+
+    private String uid;
+
+    private String orderCode;
+
+    private int itemQuantityTotal;
+
+    private String segmentCode;
+
+    private String consoType;
+
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectMailDetailImpl.java

@@ -5,8 +5,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.CollectMailDetailEntity;
 import org.ta.pddserver.mapper.CollectMailDetailMapper;
+import org.ta.pddserver.model.api.request.CollectMailDetailListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
+import org.ta.pddserver.model.api.response.LogOrderListResponse;
 import org.ta.pddserver.service.CollectMailDetailService;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper, CollectMailDetailEntity> implements CollectMailDetailService {
 
@@ -19,7 +26,19 @@ public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper,
         return baseMapper.updateStatusByUid(status, uid);
     }
 
-    public Boolean updateByMailNo(String mailNo, String action) {
-        return baseMapper.updateByMailNo(mailNo, action);
+    public Boolean updateByMailNo(String mailNo, int status) {
+        return baseMapper.updateByMailNo(mailNo, status);
+    }
+
+    public Object getList(CollectMailDetailListRequest param) {
+
+        Integer count = baseMapper.countUsable(param);
+        param.checkPage(count,20);
+        List<CollectMailDetailListResponse> list = baseMapper.getListByRequest(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", count);
+        map.put("list", list);
+        map.put("page", param.getPage());
+        return map;
     }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/CollectOrderImpl.java

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.CollectOrderEntity;
 import org.ta.pddserver.mapper.CollectOrderMapper;
+import org.ta.pddserver.model.api.response.CollectOrderListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderResponse;
 import org.ta.pddserver.service.CollectOrderService;
 
+import java.util.List;
+
 @Service
 public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrderEntity> implements CollectOrderService {
 
@@ -19,4 +22,12 @@ public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrd
     public int updateOrderStatus(int status, String uid) {
         return this.baseMapper.updateOrderStatusById(status, uid);
     }
+
+    public List<CollectOrderListResponse> getList(String orderCode, int status) {
+        return baseMapper.getList(orderCode, status);
+    }
+
+    public CollectOrderResponse getInfoByOrderCode(String orderCode) {
+        return baseMapper.getInfoByOrderCode(orderCode);
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailImpl.java

@@ -19,8 +19,8 @@ import java.util.Map;
 @Service
 public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper, LogOrderMailDetailEntity> implements LogOrderMailDetailService {
 
-    public Boolean updateByMailNo(String mailNo, String action) {
-       return baseMapper.updateByMailNo(mailNo, action);
+    public Boolean updateByMailNo(String mailNo, int status) {
+       return baseMapper.updateByMailNo(mailNo, status);
     }
 
     public List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
@@ -47,8 +47,8 @@ public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper
     }
 
 
-    public MailNoResponse getInfoByMailNo(String mailNo, String status) {
-        return baseMapper.getInfoByMailNo(mailNo, status);
+    public MailNoResponse getInfoByMailNo(String mailNo) {
+        return baseMapper.getInfoByMailNo(mailNo);
     }
 
 

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

+//package org.ta.pddserver.utils;
+//
+//import org.springframework.stereotype.Component;
+//
+//@Component
+//public enum StatusEnum {
+//    ORDERCREATE(1, "创建订单"),
+//    SIGNED(10, "签收"),
+//    REJECTED(11, "拒签"),
+//    DESTROY(12, "销毁"),
+//    UNINBOUND(19, "未入库"),
+//    INBOUND(20, "入库"),
+//    PARTINBOUND(21, "部分入库"),
+//    FULLINBOUND(22, "全部入库"),
+//    UNPACK(30, "通知拆包"),
+//    FINISHUNPACK(39, "拆包完成"),
+//    OUTBOUND(40, "通知出库"),
+//    BEGINPICK(50, "开始拣货"),
+//    FINISHPICK(59, "拣货完成"),
+//    FINISHOUTBOUND(60, "出库"),
+//    UNKNOWN(-1, "未知");
+//
+//    private final int code;
+//    private final String desc;
+//
+//    // 枚举构造方法默认私有，无需 Spring 注入
+//    StatusEnum(int code, String desc) {
+//        this.code = code;
+//        this.desc = desc;
+//    }
+//
+//    // 仅保留 Getter，无 Setter
+//    public int getCode() {
+//        return code;
+//    }
+//
+//    public String getDesc() {
+//        return desc;
+//    }
+//
+//    // 根据状态码查询枚举（核心业务方法）
+//    public static StatusEnum getByCode(int code) {
+//        for (StatusEnum status : StatusEnum.values()) {
+//            if (status.getCode() == code) {
+//                return status;
+//            }
+//        }
+//        return UNKNOWN;
+//    }
+//
+//}

PddServer/src/main/resources/application.yaml

 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    #    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
+    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  # 最大活跃连接数