commit

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderEntity.java

@@ -52,4 +52,8 @@ public class LogOrderEntity {
     @TableField(value = "packageQuantity")
     private Long packageQuantity;
 
+    @TableField(value = "num")
+    private Integer num;
+
+
 }

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

@@ -31,4 +31,7 @@ public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEnt
 
     @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);
+
+    @Select("SELECT * FROM `collect_mail_detail` WHERE `orderCode` = #{orderCode}")
+    List<CollectMailDetailEntity> findListByOrderCode(@Param("orderCode") String orderCode);
 }

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

@@ -6,6 +6,9 @@ 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.request.CollectMailDetailListRequest;
+import org.ta.pddserver.model.api.request.CollectOrderListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderResponse;
 
@@ -25,4 +28,14 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
     @Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
     CollectOrderResponse getInfoByOrderCode(@Param("orderCode") String orderCode);
+
+    @Select("SELECT COUNT(*) FROM (SELECT a.`uid` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' GROUP BY a.`uid`) t; ")
+    Integer countUsable(CollectOrderListRequest param);
+
+    @Select("SELECT a.`uid`, a.`orderCode`, a.`itemQuantityTotal`, GROUP_CONCAT(b.`mailNo` SEPARATOR ';') as mailNo, a.`created` FROM `collect_order` a LEFT JOIN `collect_mail_detail` b ON a.`orderCode` = b.`orderCode` WHERE a.`orderCode` LIKE '%${orderCode}%' AND a.`status` LIKE '%${status}%' GROUP BY a.`uid` ORDER BY a.`created` DESC LIMIT #{offset}, #{size}; ")
+    List<CollectOrderListResponse> getListByRequest(CollectOrderListRequest param);
+
+    @Select("SELECT * FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    CollectOrderEntity getAllInfoByOrderCode(@Param("orderCode") String orderCode);
+
 }

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

@@ -34,9 +34,10 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
 
 
 
-    @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated`, `status` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
+    @Select("SELECT a.`uid`, a.`logisticsOrderCode` , a.`expressCode` ,a.`mailNo`, a.`updated`, a.`status`, b.`num` FROM `log_order_mail_detail` a, `log_order` b WHERE a.`mailNo` = #{mailNo} AND a.`logisticsOrderCode` = b.`logisticsOrderCode`;")
     MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo);
 
+
     @Select("SELECT * FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} ;")
     LogOrderMailDetailEntity getAllInfoByMailNo(@Param("mailNo") String mailNo);
 

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

@@ -29,7 +29,7 @@ public interface LogOrderMapper extends BaseMapper<LogOrderEntity> {
     @Select("SELECT count(t.uid) FROM ( SELECT a.uid  FROM  `log_order` a WHERE  a.`logisticsOrderCode` LIKE '%${logisticsOrderCode}%'  ) t")
     Integer countUsable(LogOrderListRequest param);
 
-    @Select("SELECT `uid`, `updated`, `logisticsOrderCode`, `bizType`, `buyerCode`, `consoType`, `dereRecogCode`, `packageQuantity` FROM `log_order` WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
+    @Select("SELECT `uid`, `updated`, `logisticsOrderCode`, `bizType`, `buyerCode`, `consoType`, `dereRecogCode`, `packageQuantity`, `num` FROM `log_order` WHERE  `logisticsOrderCode` LIKE '%${logisticsOrderCode}%' ORDER BY uid DESC LIMIT #{offset}, #{size}; ")
     List<LogOrderListResponse> getListByRequest(LogOrderListRequest param);
 
     @Update("UPDATE `log_order` SET `status` = ${status} WHERE  `logisticsOrderCode` = #{logisticsOrderCode}")

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

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

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

@@ -2,11 +2,15 @@ package org.ta.pddserver.model.api.request;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class FinishUnpackRequest {
 
     private String mailNo;
 
+    private String orderCode;
+
     private String logisticsOrderCode;
 
     private String status;

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

@@ -7,6 +7,10 @@ public class InBoundRequest {
 
     private String mailNo;
 
+    private String logisticsOrderCode;
+
+    private String orderCode;
+
     private String status;
 
     private Long length;
@@ -20,4 +24,8 @@ public class InBoundRequest {
     private Long actualWeight;
 
     private String action;
+
+    private int code;
+
+    private String goodsType;
 }

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

@@ -11,8 +11,8 @@ public class CollectOrderListResponse {
 
     private int itemQuantityTotal;
 
-    private String segmentCode;
+    private String mailNo;
 
-    private String consoType;
+    private String created;
 
 }

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

@@ -12,6 +12,7 @@ public class LogOrderListResponse {
     private String consoType;
     private String dereRecogCode;
     private int packageQuantity;
+    private int num;
     private String tags;
     private String buyerCode;
 

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

@@ -11,4 +11,5 @@ public class MailNoResponse {
     private String mailNo;
     private String updated;
     private String status;
+    private int num;
 }

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

+package org.ta.pddserver.model.enums;
+
+public enum ErrorEnum {
+    LOSE(101, "丢失"),
+    DAMAGE(102, "破损"),
+    RESTRICTED(103, "禁限运-待确认处理方式，确认后可退货或者销毁"),
+    OVERWEIGHT(104, "超重超体积-待确认处理方式，确认后可退货或继续运输"),
+    MISSING(105, "补全姓名、地址、联系方式信息"),
+    OTHER(106, "其他待确认事项"),
+    UNKNOWN(-1, "未知");
+
+    private final int code;
+    private final String desc;
+
+    // 枚举构造方法默认私有，无需 Spring 注入
+    ErrorEnum(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    // 仅保留 Getter，无 Setter
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    // 根据状态码查询枚举（核心业务方法）
+    public static ErrorEnum getByCode(int code) {
+        for (ErrorEnum status : ErrorEnum.values()) {
+            if (status.getCode() == code) {
+                return status;
+            }
+        }
+        return UNKNOWN;
+    }
+
+}

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

@@ -6,14 +6,16 @@ public enum OrderRejectCode {
 
     ChaoDa (20, "超大", "很抱歉，您的包裹因超大原因被{}集运仓拒签，请联系卖家并申请退款", "超大"),
     ChaoZhong (21, "超重", "很抱歉，您的包裹超重原因被{}集运仓拒签，请联系卖家并申请退款", "超重"),
-    JinYun(22, "运输品类限制", "很抱歉，您的包裹因运输品类限制原因被{}集运仓拒签，请联系卖家并申请退款", "海关违禁品（目的地海关政策禁止入境商品）"),
+    JinYun(22, "海关违禁品", "很抱歉，您的包裹因运输品类限制原因被{}集运仓拒签，请联系卖家并申请退款", "海关违禁品（目的地海关政策禁止入境商品）"),
     TeHuo (23, "运输品类限制", "很抱歉，您的包裹因运输品类限制原因被{}集运仓拒签，请联系卖家并申请退款", "运输品类限制（液体、粉末、带电、带磁性、易碎品）"),
     YeWuYiChang (24, "货到付款", "很抱歉，您的包裹因货到付款原因被{}集运仓拒签，请联系卖家并申请退款", "到付件，”到付“，是指卖家拍下商品时为货到付款，仓库不承担这部分一段费用而拒收。"),
     YeWuYiChang2 (25, "非原面单/外包装", "很抱歉，您的包裹因非原面单/外包装原因被{}集运仓拒签，请联系卖家并申请退款", "非原面单/外包装"),
     ShouHou (26, "申请退货", "很抱歉，您的包裹因申请退货原因被{}集运仓拒签，请联系卖家并申请退款", "申请退货"),
     ShenQingTuiHuo (27, "破损", "很抱歉，您的包裹因破损原因被{}集运仓拒签，请联系卖家并申请退款", "破损"),
-    BaoGuoWuXiao (33, "包裹无效", "很抱歉，您的包裹因包裹无效原因无法正常入库，请速与{}集运商联系。", "包裹无效（无实物）")
-    ;
+    BaoGuoWuXiao (33, "包裹无效", "很抱歉，您的包裹因包裹无效原因无法正常入库，请速与{}集运商联系。", "包裹无效（无实物）"),
+    UNKNOWN (0, "异常", "异常", "异常");
+
+
     @Getter
     private int value;
     @Getter
@@ -30,4 +32,14 @@ public enum OrderRejectCode {
         this.info = info;
     }
 
+    // 根据状态码查询枚举（核心业务方法）
+    public static OrderRejectCode getByCode(int value) {
+        for (OrderRejectCode orderRejectCode : OrderRejectCode.values()) {
+            if (orderRejectCode.getValue() == value) {
+                return orderRejectCode;
+            }
+        }
+        return UNKNOWN;
+    }
+
 }

PddServer/src/main/java/org/ta/pddserver/utils/StatusEnum.java → PddServer/src/main/java/org/ta/pddserver/model/enums/StatusEnum.java

-package org.ta.pddserver.utils;
+package org.ta.pddserver.model.enums;
 
 public enum StatusEnum {
     ORDERCREATE(1, "创建订单"),
@@ -9,12 +9,14 @@ public enum StatusEnum {
     INBOUND(20, "入库"),
     PARTINBOUND(21, "部分入库"),
     FULLINBOUND(22, "全部入库"),
+    BOUNDERROR(22, "入库异常"),
     UNPACK(30, "通知拆包"),
     UNPACKBEGINPICK(31, "开始拣货"),
     UNPACKFINISHPICK(32, "拣货完成"),
     FINISHUNPACK(39, "拆包完成"),
     OUTBOUND(40, "通知出库"),
     BEGINPICK(50, "开始拣货"),
+    PICKERROR(51, "开始拣货异常"),
     FINISHPICK(59, "拣货完成"),
     FINISHOUTBOUND(60, "出库"),
     UNKNOWN(-1, "未知");

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

@@ -41,4 +41,8 @@ public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper,
         map.put("page", param.getPage());
         return map;
     }
+
+    public List<CollectMailDetailEntity> findListByOrderCode(String orderCode) {
+        return baseMapper.findListByOrderCode(orderCode);
+    }
 }
\ No newline at end of file

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

@@ -5,11 +5,15 @@ 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.request.CollectOrderListRequest;
+import org.ta.pddserver.model.api.response.CollectMailDetailListResponse;
 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.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrderEntity> implements CollectOrderService {
@@ -23,11 +27,23 @@ public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrd
         return this.baseMapper.updateOrderStatusById(status, uid);
     }
 
-    public List<CollectOrderListResponse> getList(String orderCode, int status) {
-        return baseMapper.getList(orderCode, status);
+    public Map getList(CollectOrderListRequest param) {
+        Integer count = baseMapper.countUsable(param);
+        param.checkPage(count,20);
+        List<CollectOrderListResponse> 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;
     }
 
     public CollectOrderResponse getInfoByOrderCode(String orderCode) {
         return baseMapper.getInfoByOrderCode(orderCode);
     }
+
+    public CollectOrderEntity getAllInfoByOrderCode(String orderCode) {
+        return baseMapper.getAllInfoByOrderCode(orderCode);
+    }
+
 }
\ No newline at end of file

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_test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: pdd
+#    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数