commit

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

@@ -5,12 +5,13 @@ import org.apache.ibatis.annotations.Mapper;
 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.CollectOrderResponse;
 
 @Mapper
 public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
-    @Select("SELECT * FROM `collect_order` WHERE `orderCode` = #{orderCode};")
-    CollectOrderEntity findByOrderCode(String orderCode);
+    @Select("SELECT `orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    CollectOrderResponse findByOrderCode(String orderCode);
 
     @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
     int updateOrderStatusById(int status, String uid);

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

@@ -5,10 +5,16 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
+import org.ta.pddserver.model.api.response.CollectOutMailDetailResponse;
+
+import java.util.List;
 
 @Mapper
 public interface CollectOutMailDetailMapper extends BaseMapper<CollectOutMailDetailEntity> {
 
     @Select("SELECT * FROM `collect_out_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0")
     CollectOutMailDetailEntity getInfoByMailNo(@Param("mailNo") String mailNo);
+
+    @Select("SELECT * FROM `collect_out_mail_detail` WHERE `orderCode` = #{orderCode} AND `state` > 0")
+    List<CollectOutMailDetailResponse> getListByOrderCode(@Param("orderCode") String orderCode);
 }

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

@@ -32,4 +32,6 @@ public interface LogOrderMapper extends BaseMapper<LogOrderEntity> {
     @Select("SELECT `uid`, `updated`, `logisticsOrderCode`, `bizType`, `buyerCode`, `consoType`, `dereRecogCode`, `packageQuantity` 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}")
+    void updateStatusByOrderCode(@Param("logisticsOrderCode") String logisticsOrderCode, @Param("status") int status);
 }

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

@@ -11,10 +11,19 @@ public class OutBoundRequest {
 
     private String orderCode;
 
-    // 派送段
-    //退回卖家：RETURNSELLER
-    //送往收货人：SENDTORECEVER
-    private String segmentCode;
+    private Long length;
+
+    private Long width;
+
+    private Long height;
+
+    private Long weight;
+
+    private String packageType;
+
+    private String mailNo;
+
+    private String expressCode;
 
     /**
      * 包裹详情
@@ -23,9 +32,6 @@ public class OutBoundRequest {
     public static class OutBoundList {
         private String mailNo;
 
-        private String expressCode;
-
-        private String packageType;
 
     }
 

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

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

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

@@ -5,14 +5,9 @@ import lombok.Data;
 @Data
 public class CollectOutMailDetailResponse {
 
-    private String uid;
-    private String updated;
-    private String logisticsOrderCode;
-    private String bizType;
-    private String consoType;
-    private String dereRecogCode;
-    private int packageQuantity;
-    private String tags;
-    private String buyerCode;
+    private String mailNo;
+
+    private String expressCode;
+
 
 }

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

@@ -5,13 +5,14 @@ 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.CollectOrderResponse;
 import org.ta.pddserver.service.CollectOrderService;
 
 @Service
 public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrderEntity> implements CollectOrderService {
 
 
-    public CollectOrderEntity getByOrderCode(String orderCode) {
+    public CollectOrderResponse getByOrderCode(String orderCode) {
         return this.baseMapper.findByOrderCode(orderCode);
     }
 

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

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
 import org.ta.pddserver.mapper.CollectOutMailDetailMapper;
+import org.ta.pddserver.model.api.response.CollectOutMailDetailResponse;
 import org.ta.pddserver.service.CollectOutMailDetailService;
 
+import java.util.List;
+
 @Service
 public class CollectOutMailDetailImpl extends ServiceImpl<CollectOutMailDetailMapper, CollectOutMailDetailEntity> implements CollectOutMailDetailService {
 
@@ -14,4 +17,8 @@ public class CollectOutMailDetailImpl extends ServiceImpl<CollectOutMailDetailMa
     public CollectOutMailDetailEntity getInfoByMailNo(String mailNo) {
         return baseMapper.getInfoByMailNo(mailNo);
     }
+
+    public List<CollectOutMailDetailResponse> getListByOrderCode(String orderCode) {
+        return baseMapper.getListByOrderCode(orderCode);
+    }
 }
\ No newline at end of file

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

@@ -44,4 +44,7 @@ public class LogOrderImpl extends ServiceImpl<LogOrderMapper, LogOrderEntity> im
     }
 
 
+    public void updateStatusByOrderCode(String logisticsOrderCode, int status) {
+        baseMapper.updateStatusByOrderCode(logisticsOrderCode, status);
+    }
 }
\ No newline at end of file