commit

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,6 +16,9 @@ import org.ta.pddserver.model.api.response.*;
 import org.ta.pddserver.model.enums.ErrorEnum;
 import org.ta.pddserver.model.enums.StatusEnum;
 import org.ta.pddserver.model.pddjy.request.*;
+import org.ta.pddserver.model.pddlg.common.TraceObject;
+import org.ta.pddserver.model.pddlg.request.PddLogisticsCoTrackNotifyRequest;
+import org.ta.pddserver.model.pddlg.response.PddLogisticsCoTrackNotifyResponse;
 import org.ta.pddserver.service.impl.*;
 import org.ta.pddserver.utils.*;
 
@@ -56,6 +60,10 @@ public class PddLocalController {
 
     @Resource
     private CollectOrderImpl collectOrderImpl;
+    @Autowired
+    private CollectOrderDetailImpl collectOrderDetailImpl;
+    @Autowired
+    private TraceObjectImpl traceObjectImpl;
 
     /*集运单列表*/
     @PostMapping("/logOrderList")
@@ -86,13 +94,12 @@ public class PddLocalController {
     /*待拆包查询*/
     @PostMapping("/packageScan")
     public Map<String, Object> packageScan(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
-        LogOrderMailDetailEntity mailDetailEntity = logOrderMailDetailImpl.getByMailNo(mailNoRequest.getMailNo());
-        if (mailDetailEntity == null) {
+        List<LogOrderMailDetailEntity> list = logOrderMailDetailImpl.getListByCode(mailNoRequest.getMailNo());
+        if (list.isEmpty()) {
             return JsonResponse.generateLocalCommonFailedResponse("-1", "信息获取失败，请检查上传信息");
         }
 
-        LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(mailDetailEntity.getLogisticsOrderCode());
-        List<LogOrderMailDetailEntity> list = logOrderMailDetailImpl.getListByCode(logOrderEntity.getLogisticsOrderCode());
+        LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(list.get(0).getLogisticsOrderCode());
 
         Map<String, Object> map = new HashMap<>();
         map.put("logOrder", logOrderEntity);
@@ -101,6 +108,59 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(map);
     }
 
+    /*待拆包列表*/
+    @PostMapping("/traceObject")
+    public JSONObject traceObject(HttpServletRequest request, @RequestBody TraceObjectRequest traceObjectRequest) {
+        TraceObjectEntity traceObject = new TraceObjectEntity();
+        traceObject.setTrackingNumber(traceObjectRequest.getTrackingNumber());
+        traceObject.setTrackingOrderNo(traceObjectRequest.getTrackingOrderNo());
+        traceObject.setId(traceObjectRequest.getId());
+        traceObject.setStatusCode(traceObjectRequest.getStatusCode());
+        traceObject.setDescription(traceObjectRequest.getDescription());
+        traceObject.setOperationTime(traceObjectRequest.getOperationTime());
+        traceObject.setTransferFlag(traceObjectRequest.getTransferFlag());
+        traceObject.setTransferNo(traceObjectRequest.getTransferNo());
+        traceObject.setTransferPartnerId(traceObjectRequest.getTransferPartnerId());
+        traceObject.setTimeZone(traceObjectRequest.getTimeZone());
+        traceObject.setSiteName(traceObjectRequest.getSiteName());
+        traceObject.setSiteType(traceObjectRequest.getSiteType());
+        traceObject.setSiteNo(traceObjectRequest.getSiteNo());
+        traceObject.setNextSiteName(traceObjectRequest.getNextSiteName());
+        traceObject.setNextSiteNo(traceObjectRequest.getNextSiteNo());
+        traceObject.setFailReason(traceObjectRequest.getFailReason());
+        traceObject.setWeight(traceObjectRequest.getWeight());
+        traceObject.setCountry(traceObjectRequest.getCountry());
+        traceObject.setCity(traceObjectRequest.getCity());
+        traceObject.setProvince(traceObjectRequest.getProvince());
+        traceObject.setDistrict(traceObjectRequest.getDistrict());
+        traceObject.setContact(traceObjectRequest.getContact());
+        traceObject.setContactInfo(traceObjectRequest.getContactInfo());
+        traceObject.setSignerName(traceObjectRequest.getSignerName());
+        traceObject.setAddress(traceObjectRequest.getAddress());
+        traceObject.setRemark(traceObjectRequest.getRemark());
+
+        traceObjectImpl.save(traceObject);
+
+        //推送pdd
+        PddLogisticsCoTrackNotifyRequest requests = new PddLogisticsCoTrackNotifyRequest();
+        requests.setClient_id(PddAPIConfig.CLIENT_ID);
+        requests.setShip_id(PddAPIConfig.SHIP_ID);
+        requests.setTarget_client_id(PddAPIConfig.CLIENT_ID);
+        requests.setTimestamp(System.currentTimeMillis() / 1000);
+        PddLogisticsCoTrackNotifyRequest.DataObject dataObject = getDataObject(traceObjectRequest.getTrackingNumber());
+        requests.setDataObject(dataObject);
+        requests.encodeData();
+        requests.setSign(PddSignTool.generateSign(requests, PddAPIConfig.CLIENT_SECRET));
+        log.info("requestModel:{}", JSON.toJSONString(requests));
+        String resp = PddHttpTool.sendJsonPost(requests);
+        log.info("resp = {}", resp);
+        PddLogisticsCoTrackNotifyResponse response = JSON.parseObject(resp, PddLogisticsCoTrackNotifyResponse.class);
+        log.info("response = {}", JSON.toJSONString(response));
+
+        return JsonResponse.generateLocalCommonSuccessResponse(true);
+    }
+
+
     /*出库列表*/
     @PostMapping("/collectMailDetailList")
     public JSONObject collectMailDetailList(HttpServletRequest request, @RequestBody CollectMailDetailListRequest collectMailDetailListRequest) {
@@ -108,6 +168,21 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(collectMailDetailImpl.getList(collectMailDetailListRequest));
     }
 
+    /*出库详情*/
+    @PostMapping("/collectOrderInfo")
+    public JSONObject collectOrderInfo(HttpServletRequest request, @RequestBody CollectOrderRequest collectOrderRequest) {
+        Map<String, Object> map = new HashMap<>();
+        CollectOrderInfoResponse collectOrderInfoResponse = collectOrderImpl.getInfoByOrderCode(collectOrderRequest.getOrderCode());
+        List<CollectOrderDetailResponse> list = collectOrderDetailImpl.getListByOrderCode(collectOrderRequest.getOrderCode());
+        CollectReceiverDetailResponse collectOrderReceiverDetailResponse = collectReceiverDetailImpl.getByOrderCode(collectOrderRequest.getOrderCode());
+
+        map.put("info", collectOrderInfoResponse);
+        map.put("detail", list);
+        map.put("receiver", collectOrderReceiverDetailResponse);
+        return JsonResponse.generateLocalCommonSuccessResponse(map);
+    }
+
+
     /*待拣货列表*/
     @PostMapping("/collectOrderList")
     public JSONObject collectOrderList(HttpServletRequest request, @RequestBody CollectOrderListRequest collectOrderListRequest) {
@@ -128,7 +203,7 @@ public class PddLocalController {
 
         Map<String, Object> map = new HashMap<>();
 
-        CollectOrderResponse collectOrderResponse = collectOrderImpl.getInfoByOrderCode(collectOrderScanRequest.getOrderCode());
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOrderScanRequest.getOrderCode());
         List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOrderScanRequest.getOrderCode());
 
         map.put("collectOrder", collectOrderResponse);
@@ -164,24 +239,14 @@ public class PddLocalController {
     @PostMapping("/mailNoSelectAll")
     public Map<String, Object> mailNoSelectAll(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
         Map<String, Object> map = new HashMap<>();
-        CollectMailDetailEntity collectMailDetail = collectMailDetailImpl.getByMailNo(mailNoRequest.getMailNo());
-        if (collectMailDetail == null) {
-            return JsonResponse.generateLocalCommonFailedResponse("-1", "该包裹不存在出库信息");
-        }
-        List<CollectMailDetailEntity> list = collectMailDetailImpl.getListByOrderCode(collectMailDetail.getOrderCode());
-        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectMailDetail.getOrderCode());
-        map.put("collectMailDetail", collectMailDetail);
-        map.put("list", list);
-        map.put("collectOrder", collectOrderResponse);
-
 
-//        CollectOutMailDetailEntity collectOutMailDetail = collectOutMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
-//        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOutMailDetail.getOrderCode());
+        CollectOutMailDetailEntity collectOutMailDetail = collectOutMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
+        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOutMailDetail.getOrderCode());
 
-//        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOutMailDetail.getOrderCode());
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOutMailDetail.getOrderCode());
 
-//        map.put("list", list);
-//        map.put("collectOutMailDetail", collectOutMailDetail);
+        map.put("list", list);
+        map.put("collectOutMailDetail", collectOutMailDetail);
 
         return JsonResponse.generateLocalCommonSuccessResponse(map);
     }
@@ -220,7 +285,7 @@ public class PddLocalController {
 
                 notifyRequest.setPackageInfo(new PddServiceConsoFirstBizActionNotifyRequest.PackageInfo());
                 notifyRequest.getPackageInfo().setWeight(receiveRequest.getWeight());
-                notifyRequest.getPackageInfo().setActualWeight(receiveRequest.getWeight());
+                notifyRequest.getPackageInfo().setActualWeight(receiveRequest.getActualWeight());
                 notifyRequest.getPackageInfo().setLength(receiveRequest.getLength());
                 notifyRequest.getPackageInfo().setWidth(receiveRequest.getWidth());
                 notifyRequest.getPackageInfo().setHeight(receiveRequest.getHeight());
@@ -311,7 +376,7 @@ public class PddLocalController {
         notifyRequest.getPackageInfo().setHeight(inBoundRequest.getHeight());
         notifyRequest.getPackageInfo().setWeight(inBoundRequest.getWeight());
         notifyRequest.getPackageInfo().setActualWeight((long) PddJYPriceTool.calculateWeight(inBoundRequest.getLength().intValue(), inBoundRequest.getWidth().intValue(), inBoundRequest.getHeight().intValue(), inBoundRequest.getWeight().intValue(), true));
-        notifyRequest.getPackageInfo().setGoodsType(inBoundRequest.getGoodsType());
+        notifyRequest.getPackageInfo().setGoodsType("NORMAL");
 
         notifyRequest.setResult(new PddServiceConsoInboundRequest.Result());
         notifyRequest.getResult().setCode(0);
@@ -484,7 +549,11 @@ public class PddLocalController {
 
         } else if (("finish_unpack").equals(finishUnpackRequest.getAction())) {
 
+            PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
 
+            if (packageNoticeEntity == null) {
+                return JsonResponse.generateLocalCommonFailedResponse("-1", "未查到拆包信息，请检查参数");
+            }
 
             LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
 
@@ -526,13 +595,8 @@ public class PddLocalController {
                 logOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
                 logOrderImpl.updateById(logOrderEntity);
 
-                PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
-
-                if (packageNoticeEntity != null) {
-                    packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
-                    packageNoticeImpl.updateById(packageNoticeEntity);
-                }
-
+                packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
+                packageNoticeImpl.updateById(packageNoticeEntity);
             }
         }
         notifyRequest.setResult(new PddServiceConsoCoBizActionNotifyRequest.Result());
@@ -611,8 +675,8 @@ public class PddLocalController {
 
             notifyRequest.setBizActionDesc("开始拣货");
             notifyResult.setCode(0);
-        }
-        else if (action.equals("finish_pick")) {
+        } else if (action.equals("finish_pick")) {
+
             collectOrderEntity = collectOrderImpl.getAllInfoByOrderCode(finishUnpackRequest.getOrderCode());
 
             if (collectOrderEntity == null) {
@@ -623,12 +687,21 @@ public class PddLocalController {
 
             notifyRequest.setBizActionDesc("拣货完成");
             notifyResult.setCode(0);
-        }
-        else if (action.equals("finish_unpack")) {
+        } else if (action.equals("finish_unpack")) {
+
+            PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
+
+            if (packageNoticeEntity == null) {
+                return JsonResponse.generateLocalCommonFailedResponse("-1", "未查到拆包信息，请检查参数");
+            }
+
             LogOrderEntity logOrderEntity = logOrderImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
+
             if (logOrderEntity == null) {
                 return JsonResponse.generateLocalCommonFailedResponse("-1", "未查到集运单信息，请检查参数");
             }
+
+
             logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHUNPACK.getCode());
 
             notifyRequest.setBizActionDesc("拆包完成");
@@ -665,13 +738,8 @@ public class PddLocalController {
                 logOrderEntity.setStatus(logOrderMailDetailIoEntity.getStatus());
                 logOrderImpl.updateById(logOrderEntity);
 
-                PackageNoticeEntity packageNoticeEntity = packageNoticeImpl.getByOrderCode(finishUnpackRequest.getOrderCode());
-
-                if (packageNoticeEntity != null) {
-                    packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
-                    packageNoticeImpl.updateById(packageNoticeEntity);
-                }
-
+                packageNoticeEntity.setStatus("" + logOrderMailDetailIoEntity.getStatus());
+                packageNoticeImpl.updateById(packageNoticeEntity);
 
             }
 
@@ -796,16 +864,16 @@ public class PddLocalController {
 
         // TODO 此处异常，需要处理
         //获取所有可出库订单
-        List<CollectMailDetailEntity> list = collectMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
+        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
 
         if (list != null && !list.isEmpty()) {
             // 拆单操作
             // 存储需要删除的元素
-            List<CollectMailDetailEntity> toRemoveList = new ArrayList<>();
+            List<CollectOutMailDetailResponse> toRemoveList = new ArrayList<>();
             List<OutBoundRequest.OutBoundList> toRemoveOutBound = new ArrayList<>();
 
 
-            for (CollectMailDetailEntity lists : list) {
+            for (CollectOutMailDetailResponse lists : list) {
                 for (OutBoundRequest.OutBoundList outBoundLists : outBoundList) {
                     if (lists.getMailNo().equals(outBoundLists.getMailNo())) {
                         toRemoveList.add(lists);
@@ -838,19 +906,16 @@ public class PddLocalController {
         notifyRequest.setIsSplitOut("N");
         notifyRequest.setPackageInfos(new ArrayList<>());
 
+        PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
 
-        for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
-            PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
-            notifyRequest.getPackageInfos().add(packageInfo);
-            packageInfo.setOutboundMailNo(outPackage.getMailNo());
-            packageInfo.setExpressCode(outPackage.getExpressCode());
-            packageInfo.setPackageType(outPackage.getPackageType());
-            packageInfo.setLength(outPackage.getLength());
-            packageInfo.setWidth(outPackage.getWidth());
-            packageInfo.setHeight(outPackage.getHeight());
-            packageInfo.setWeight(outPackage.getWeight());
-        }
-
+        notifyRequest.getPackageInfos().add(packageInfo);
+//        packageInfo.setOutboundMailNo(outBoundRequest.getMailNo());
+//        packageInfo.setExpressCode(outBoundRequest.getExpressCode());
+//        packageInfo.setPackageType(outBoundRequest.getPackageType());
+//        packageInfo.setLength(outBoundRequest.getLength());
+//        packageInfo.setWidth(outBoundRequest.getWidth());
+//        packageInfo.setHeight(outBoundRequest.getHeight());
+//        packageInfo.setWeight(outBoundRequest.getWeight());
 
 
         notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
@@ -866,7 +931,7 @@ public class PddLocalController {
         notifyRequest.getSenderDetail().setDetailAddress(collectOrderSendEntity.getDetailAddress());
 
 
-        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByMailNo(outBoundRequest.getOrderCode());
+        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByOrderCode(outBoundRequest.getOrderCode());
         notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
         notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
         notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
@@ -892,26 +957,21 @@ public class PddLocalController {
         requestModel.setSign(PddSignTool.generateSign(requestModel, PddAPIConfig.CLIENT_SECRET));
         String resp = PddHttpTool.sendJsonPost(requestModel);
 
-        for (OutBoundRequest.OutPackage outPackage : outBoundRequest.getOutPackageList()) {
-            LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
-            logOrderMailDetailIoEntity.setMailNo(outPackage.getMailNo());
-            logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
-            logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
-            logOrderMailDetailIoEntity.setExpressCode(outPackage.getExpressCode());
-            logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
-            logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
-            logOrderMailDetailIoEntity.setResp(resp);
+        LogOrderMailDetailIoEntity logOrderMailDetailIoEntity = new LogOrderMailDetailIoEntity();
+//        logOrderMailDetailIoEntity.setMailNo(outBoundRequest.getMailNo());
+//        logOrderMailDetailIoEntity.setExpressCode(outBoundRequest.getExpressCode());
+//        logOrderMailDetailIoEntity.setLogisticsOrderCode(outBoundRequest.getOrderCode());
+//        logOrderMailDetailIoEntity.setExpressCode(outBoundRequest.getExpressCode());
+        logOrderMailDetailIoEntity.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
+        logOrderMailDetailIoEntity.setReq(JSON.toJSONString(requestModel));
+        logOrderMailDetailIoEntity.setResp(resp);
 
-            logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
+        logOrderMailDetailIoImpl.save(logOrderMailDetailIoEntity);
 
-            //更新collect_mail_detail
-            for (CollectMailDetailEntity lists : list) {
-                Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
-            }
+        //更新collect_mail_detail
+        for (CollectOutMailDetailResponse lists : list) {
+            Boolean result = collectMailDetailImpl.updateByMailNo(lists.getMailNo(), logOrderMailDetailIoEntity.getStatus());
         }
-
-
-
         return JsonResponse.generateLocalCommonSuccessResponse(true);
     }
 
@@ -922,4 +982,17 @@ public class PddLocalController {
         return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailIoImpl.getListByRequest(param));
     }
 
+    private PddLogisticsCoTrackNotifyRequest.DataObject getDataObject(String code) {
+        PddLogisticsCoTrackNotifyRequest.DataObject dataObjects = new PddLogisticsCoTrackNotifyRequest.DataObject();
+        dataObjects.setTraces(new ArrayList<>());
+
+        List<TraceObjectEntity> list = traceObjectImpl.selectByTrackingNumber(code);
+        List<org.ta.pddserver.model.pddlg.common.TraceObject> traceObjects = new ArrayList<>();
+        for (TraceObjectEntity traceObjectEntity : list) {
+            dataObjects.getTraces().add(TraceObject.createFromTraceEntity(traceObjectEntity));
+        }
+
+        return dataObjects;
+    }
+
 }

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