commit

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

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.ta.pddserver.entity.*;
+import org.ta.pddserver.model.api.response.CollectOrderResponse;
 import org.ta.pddserver.model.enums.IdentityErrorType;
 import org.ta.pddserver.model.pddjy.request.JYBaseRequestModel;
 import org.ta.pddserver.model.pddjy.request.*;
@@ -617,7 +618,7 @@ public class PddOpenController {
         reverseNotifyImpl.save(reverseNotifyEntity);
         String orderCode = notifyRequest.getOrderCode();
         if (notifyRequest.getType().toUpperCase().equals("HEBAO")) {
-            CollectOrderEntity collectOrderEntity = collectOrderImpl.getByOrderCode(orderCode);
+            CollectOrderResponse collectOrderEntity = collectOrderImpl.getByOrderCode(orderCode);
             if (collectOrderEntity != null) {
                 if (notifyRequest.getStatus().toUpperCase().equals("CANCELOUTBOUND")) {
                     collectOrderImpl.updateOrderStatus(11, collectOrderEntity.getUid());
@@ -699,7 +700,7 @@ public class PddOpenController {
     }
 
     public void UnpackNotice(PddServiceConsoUnpackNoticeRequest noticeRequest) {
-        CollectOrderEntity collectOrderEntity = collectOrderImpl.getByOrderCode(noticeRequest.getOrderCode());
+        CollectOrderResponse collectOrderEntity = collectOrderImpl.getByOrderCode(noticeRequest.getOrderCode());
         if (collectOrderEntity == null) {
             log.error("未找到合包单，单号：{}", noticeRequest.getOrderCode());
         } else {

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

@@ -10,7 +10,7 @@ import org.ta.pddserver.model.api.response.CollectOrderResponse;
 @Mapper
 public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
-    @Select("SELECT `orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    @Select("SELECT `uid`,`orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
     CollectOrderResponse findByOrderCode(String orderCode);
 
     @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")

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

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class CollectOrderResponse {
 
+    private String uid;
+
     private String orderCode;
 
     private int itemQuantityTotal;