commit

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

@@ -6,10 +6,13 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.CollectOrderDetailEntity;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
+import org.ta.pddserver.model.api.response.CollectOrderDetailResponse;
+
+import java.util.List;
 
 @Mapper
 public interface CollectOrderDetailMapper extends BaseMapper<CollectOrderDetailEntity> {
 
-    @Select("SELECT * FROM `collect_out_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0")
-    CollectOutMailDetailEntity getInfoByMailNo(@Param("mailNo") String mailNo);
+    @Select("SELECT `uid`, `orderCode`, `orderSn`, `logisticsOrderCode`, `itemId`, `itemName`, `categoryName`, `itemQuantity`, `weightTotal`, `actualAmount`, `productName`, `exportDecAmount` FROM `collect_order_detail` WHERE `orderCode` = #{orderCode}; ")
+    List<CollectOrderDetailResponse> getListByOrderCode(String orderCode);
 }

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

@@ -9,6 +9,7 @@ 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.CollectOrderInfoResponse;
 import org.ta.pddserver.model.api.response.CollectOrderListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderResponse;
 
@@ -17,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
 
-    @Select("SELECT `uid`,`orderCode`, `itemQuantityTotal`, `segmentCode` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    @Select("SELECT `uid`,`orderCode`, `itemQuantityTotal`, `segmentCode`, `consoType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
     CollectOrderResponse findByOrderCode(String orderCode);
 
     @Update("UPDATE `collect_order` SET `status` = #{status} WHERE `uid` = #{uid};")
@@ -26,8 +27,8 @@ public interface CollectOrderMapper extends BaseMapper<CollectOrderEntity> {
     @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);
+    @Select("SELECT `uid`, `orderCode`, `itemQuantityTotal`, `tradeOrderActualAmountTotal`,`segmentCode`, `consoType`, `deliveryType` FROM `collect_order` WHERE `orderCode` = #{orderCode};")
+    CollectOrderInfoResponse 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);

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

@@ -5,9 +5,13 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.CollectReceiverDetailEntity;
+import org.ta.pddserver.model.api.response.CollectReceiverDetailResponse;
 
 @Mapper
 public interface CollectReceiverDetailMapper extends BaseMapper<CollectReceiverDetailEntity> {
     @Select("SELECT  * FROM `collect_order_receiver_detail` WHERE `orderCode`  = #{orderCode} AND `state` > 0")
-    CollectReceiverDetailEntity getInfoByMailNo(@Param("orderCode") String orderCode);
+    CollectReceiverDetailEntity getInfoByOrderCode(@Param("orderCode") String orderCode);
+
+    @Select("SELECT `uid`, `name`, `idNumber`, `telePhone`, `country`, `province`, `city`, `district`, `detailAddress`, `postCode` FROM `collect_order_receiver_detail` WHERE `orderCode`  = #{orderCode} AND `state` > 0")
+    CollectReceiverDetailResponse getByOrderCode(@Param("orderCode") String orderCode);
 }

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

@@ -8,4 +8,6 @@ public class CollectMailDetailRequest extends PageTool {
 
     private String mailNo;
 
+    private String orderCode;
+
 }

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

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

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

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class TraceObjectRequest extends PageTool {
+
+    private String trackingNumber;
+
+    private String trackingOrderNo;
+
+    private String id;
+
+    private String statusCode;
+
+    private String description;
+
+    private String operationTime;
+
+    private int transferFlag;
+
+    private String transferNo;
+
+    private String transferPartnerId;
+
+    private String timeZone;
+
+    private String siteName;
+
+    private int siteType;
+
+    private String siteNo;
+
+    private String nextSiteName;
+
+    private int nextSiteType;
+
+    private String nextSiteNo;
+
+    private String failReason;
+
+    private double weight;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String district;
+
+    private String contact;
+
+    private String contactInfo;
+
+    private String signerName;
+
+    private String address;
+
+    private String remark;
+}

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

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectOrderDetailResponse {
+
+    private String uid;
+
+    private String orderCode;
+
+    private String orderSn;
+
+    private String logisticsOrderCode;
+
+    private String itemId;
+
+    private String itemName;
+
+    private String categoryName;
+
+    private int itemQuantity;
+
+    private int weightTotal;
+
+    private int actualAmount;
+
+    private String productName;
+
+    private int exportDecAmount;
+
+}

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

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

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

@@ -13,4 +13,6 @@ public class CollectOrderResponse {
 
     private String segmentCode;
 
+    private String consoType;
+
 }

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

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class CollectReceiverDetailResponse {
+
+    private String uid;
+
+    private String name;
+
+    private String idNumber;
+
+    private String telePhone;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String district;
+
+    private String detailAddress;
+
+    private String postCode;
+}

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

@@ -5,10 +5,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.CollectOrderDetailEntity;
 import org.ta.pddserver.mapper.CollectOrderDetailMapper;
+import org.ta.pddserver.model.api.response.CollectOrderDetailResponse;
 import org.ta.pddserver.service.CollectOrderDetailService;
 
+import java.util.List;
+
 @Service
 public class CollectOrderDetailImpl extends ServiceImpl<CollectOrderDetailMapper, CollectOrderDetailEntity> implements CollectOrderDetailService {
 
 
+    public List<CollectOrderDetailResponse> getListByOrderCode(String orderCode) {
+        return baseMapper.getListByOrderCode(orderCode);
+    }
 }
\ No newline at end of file

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

@@ -7,6 +7,7 @@ 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.CollectOrderInfoResponse;
 import org.ta.pddserver.model.api.response.CollectOrderListResponse;
 import org.ta.pddserver.model.api.response.CollectOrderResponse;
 import org.ta.pddserver.service.CollectOrderService;
@@ -38,7 +39,7 @@ public class CollectOrderImpl extends ServiceImpl<CollectOrderMapper, CollectOrd
         return map;
     }
 
-    public CollectOrderResponse getInfoByOrderCode(String orderCode) {
+    public CollectOrderInfoResponse getInfoByOrderCode(String orderCode) {
         return baseMapper.getInfoByOrderCode(orderCode);
     }
 

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

@@ -5,13 +5,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.CollectReceiverDetailEntity;
 import org.ta.pddserver.mapper.CollectReceiverDetailMapper;
+import org.ta.pddserver.model.api.response.CollectReceiverDetailResponse;
 import org.ta.pddserver.service.CollectReceiverDetailService;
 
 @Service
 public class CollectReceiverDetailImpl extends ServiceImpl<CollectReceiverDetailMapper, CollectReceiverDetailEntity> implements CollectReceiverDetailService {
 
 
-    public CollectReceiverDetailEntity getInfoByMailNo(String orderCode) {
-        return baseMapper.getInfoByMailNo(orderCode);
+    public CollectReceiverDetailEntity getInfoByOrderCode(String orderCode) {
+        return baseMapper.getInfoByOrderCode(orderCode);
+    }
+
+    public CollectReceiverDetailResponse getByOrderCode(String orderCode) {
+        return baseMapper.getByOrderCode(orderCode);
     }
 }
\ No newline at end of file