commit

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

+package org.ta.pddserver.controller;
+
+import com.alibaba.fastjson.JSON;
+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;
+import org.ta.pddserver.entity.*;
+import org.ta.pddserver.model.api.request.*;
+import org.ta.pddserver.model.api.response.*;
+import org.ta.pddserver.model.pddjy.request.*;
+import org.ta.pddserver.service.impl.*;
+import org.ta.pddserver.utils.JsonResponse;
+import org.ta.pddserver.utils.PddHttpTool;
+import org.ta.pddserver.utils.PddSignTool;
+import org.ta.pddserver.utils.TimeTool;
+
+import java.util.*;
+
+@Slf4j
+@RestController
+public class PddLocalsController {
+
+
+    @Resource
+    LogOrderImpl logOrderImpl;
+
+    @Resource
+    LogOrderMailDetailImpl logOrderMailDetailImpl;
+
+    @Resource
+    TimeTool timeTool;
+
+    @Resource
+    CollectOutMailDetailImpl  collectOutMailDetailImpl;
+
+    @Resource
+    CollectOrderSendImpl  collectOrderSendImpl;
+
+    @Resource
+    LogOrderMailDetailIoImpl logOrderMailDetailIo;
+
+    private static final String PROVIDER_CODE = "HAIJI_KR";
+    private static final String WAREHOUSE_CODE = "HJJY001";
+    private static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
+    private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    @Autowired
+    private CollectReceiverDetailImpl collectReceiverDetailImpl;
+    @Autowired
+    private CollectMailDetailImpl collectMailDetailImpl;
+    @Autowired
+    private CollectOrderImpl collectOrderImpl;
+
+    /*集运单列表*/
+    @PostMapping("/logOrderList")
+    public JSONObject logOrderList(HttpServletRequest request, @RequestBody LogOrderListRequest logOrderListRequest) {
+        return JsonResponse.generateLocalCommonSuccessResponse( logOrderImpl.getListByRequest(logOrderListRequest));
+    }
+
+    /*包裹列表*/
+    @PostMapping("/logOrderMailDetailList")
+    public JSONObject logOrderMailDetailList(HttpServletRequest request, @RequestBody LogOrderMailDetailListRequest logOrderMailDetailListRequest) {
+        return JsonResponse.generateLocalCommonSuccessResponse(logOrderMailDetailImpl.getListByCodeNo(logOrderMailDetailListRequest));
+    }
+
+    /*运单号查询*/
+    @PostMapping("/mailNoSelect")
+    public JSONObject mailNoSelect(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo(), mailNoRequest.getStatus());
+        return JsonResponse.generateLocalCommonSuccessResponse(mailNoResponse);
+    }
+
+    /*运单号获取所有出库单信息*/
+    @PostMapping("/mailNoSelectAll")
+    public Map mailNoSelectAll(HttpServletRequest request, @RequestBody MailNoRequest mailNoRequest) {
+        Map<String, Object> map = new HashMap<>();
+
+        CollectOutMailDetailEntity collectOutMailDetail = collectOutMailDetailImpl.getInfoByMailNo(mailNoRequest.getMailNo());
+        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(collectOutMailDetail.getOrderCode());
+
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(collectOutMailDetail.getOrderCode());
+
+        map.put("list", list);
+        map.put("collectOutMailDetail", collectOutMailDetail);
+
+        return JsonResponse.generateLocalCommonSuccessResponse(map);
+    }
+
+    /*签收*/
+    @PostMapping("/receive")
+    public void receive(HttpServletRequest request, @RequestBody ReceiveRequest receiveRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(receiveRequest.getMailNo(), receiveRequest.getStatus());
+
+//        LogOrderMailDetailImpl ioEntity = new LogOrderMailDetailImpl();
+//        ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+//        ioEntity.setExpressCode(mailNoResponse.getExpressCode());
+//        ioEntity.setMailNo(mailNoResponse.getMailNo());
+//        ioEntity.setAction(receiveRequest.getAction());
+//        ioEntity.setStatus(10);
+
+        String action = receiveRequest.getAction();
+
+        PddServiceConsoFirstBizActionNotifyRequest notifyRequest = new PddServiceConsoFirstBizActionNotifyRequest();
+        notifyRequest.setProviderCode(PROVIDER_CODE);
+        notifyRequest.setExecuteTime(timeTool.getNowString());
+        notifyRequest.setTimeZone("UTC+8");
+        notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        notifyRequest.setBizAction(action);
+        PddServiceConsoFirstBizActionNotifyRequest.Result notifyResult = new PddServiceConsoFirstBizActionNotifyRequest.Result();
+        notifyRequest.setMailNo(mailNoResponse.getMailNo());
+        notifyRequest.setExpressCode(mailNoResponse.getExpressCode());
+
+        if (action == "warehouse_sign") {
+            notifyRequest.setBizActionDesc("仓库签收");
+            notifyResult.setCode(0);
+        } else if (action == "warehouse_reject_sign") {
+            notifyRequest.setBizActionDesc("仓库拒签");
+            notifyResult.setCode(22);
+            notifyResult.setDesc("运输品类限制");
+            notifyResult.setRemark("运输品类限制");
+            notifyRequest.setResult(notifyResult);
+        } else if (action == "destroy") {
+            notifyRequest.setBizActionDesc("包裹销毁");
+            notifyResult.setCode(0);
+        }
+
+        notifyRequest.setResult(notifyResult);
+
+        JYBaseRequestModel requestModel = new JYBaseRequestModel();
+        requestModel.setRequest(JSON.toJSONString(notifyRequest));
+        requestModel.setRequest_id("" + new Date().getTime());
+        requestModel.setType("pdd.service.conso.first.biz.action.notify");
+        requestModel.setTarget_client_id(CLIENT_ID);
+        requestModel.setClient_id(CLIENT_ID);
+        long time = new Date().getTime() / 1000;
+        requestModel.setTimestamp(time);
+        requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPost(requestModel);
+
+        //更新log_order_mail_detail
+        Boolean result = logOrderMailDetailImpl.updateByMailNo(receiveRequest.getMailNo(), action);
+//
+//        ioEntity.setReq(JSON.toJSONString(requestModel));
+//        ioEntity.setResp(resp);
+//        logOrderIoImpl.save(ioEntity);
+    }
+
+    /*入库*/
+    @PostMapping("/inBound")
+    public void inBound(HttpServletRequest request, @RequestBody InBoundRequest inBoundRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(inBoundRequest.getMailNo(), inBoundRequest.getStatus());
+
+//        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+//        ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+//        ioEntity.setExpressCode(mailNoResponse.getExpressCode());
+//        ioEntity.setMailNo(mailNoResponse.getMailNo());
+//        ioEntity.setStatus(20);
+
+        PddServiceConsoInboundRequest notifyRequest = new PddServiceConsoInboundRequest();
+
+        Long status = 0L;
+        Long unStatus = 0L;
+
+        // 查询orderNO 下所有mailNo,判断是全部还是部分
+        Long unNum = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), unStatus);
+        Long num = logOrderMailDetailImpl.getSumByCodeStatus(mailNoResponse.getLogisticsOrderCode(), status);
+
+        notifyRequest.setProviderCode(PROVIDER_CODE);
+        notifyRequest.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        notifyRequest.setExecuteTime(timeTool.getNowString());
+        notifyRequest.setTimeZone("UTC+8");
+
+        notifyRequest.setStatus("FULL_INBOUND");
+        notifyRequest.setPackageQuantity(num + 1); // 已入库数量 + 1
+
+        notifyRequest.setPackageInfo(new PddServiceConsoInboundRequest.PackageInfo());
+        notifyRequest.getPackageInfo().setMailNo(mailNoResponse.getMailNo());
+        notifyRequest.getPackageInfo().setExpressCode(mailNoResponse.getExpressCode());
+        notifyRequest.getPackageInfo().setLength(inBoundRequest.getLength());
+        notifyRequest.getPackageInfo().setWidth(inBoundRequest.getWidth());
+        notifyRequest.getPackageInfo().setHeight(inBoundRequest.getHeight());
+        notifyRequest.getPackageInfo().setWeight(inBoundRequest.getWeight());
+        notifyRequest.getPackageInfo().setActualWeight(inBoundRequest.getActualWeight());
+        notifyRequest.getPackageInfo().setGoodsType("NORMAL");
+
+        notifyRequest.setResult(new PddServiceConsoInboundRequest.Result());
+        notifyRequest.getResult().setCode(0);
+
+        JYBaseRequestModel requestModel = new JYBaseRequestModel();
+        requestModel.setRequest(JSON.toJSONString(notifyRequest));
+        requestModel.setRequest_id("" + new Date().getTime());
+        requestModel.setType("pdd.service.conso.inbound");
+        requestModel.setTarget_client_id(CLIENT_ID);
+        requestModel.setClient_id(CLIENT_ID);
+        long time = new Date().getTime() / 1000;
+        requestModel.setTimestamp(time);
+        requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPost(requestModel);
+
+        //更新入库包裹状态
+
+//        ioEntity.setReq(JSON.toJSONString(requestModel));
+//        ioEntity.setResp(resp);
+//        logOrderIoImpl.save(ioEntity);
+
+        //判断是否全部入库
+        if(unNum - 1 == 0){
+            //全部入库
+            logOrderImpl.updateStatusByOrderCode(mailNoResponse.getLogisticsOrderCode(), 0);
+        }
+    }
+
+    /*收到拆包通知后 完成拆包*/
+    @PostMapping("/finishUnpack")
+    public void finishUnpack(HttpServletRequest request, @RequestBody FinishUnpackRequest finishUnpackRequest) {
+        MailNoResponse mailNoResponse = logOrderMailDetailImpl.getInfoByMailNo(finishUnpackRequest.getMailNo(), finishUnpackRequest.getStatus());
+
+//        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+//        ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+//        ioEntity.setExpressCode(mailNoResponse.getExpressCode());
+//        ioEntity.setMailNo(mailNoResponse.getMailNo());
+
+
+        String action = finishUnpackRequest.getAction();
+
+        PddServiceConsoCoBizActionNotifyRequest notifyRequest = new PddServiceConsoCoBizActionNotifyRequest();
+        notifyRequest.setProviderCode(PROVIDER_CODE);
+        notifyRequest.setOrderCode(mailNoResponse.getLogisticsOrderCode());
+        notifyRequest.setBizAction(action);
+        notifyRequest.setExecuteTime(timeTool.getNowString());
+        notifyRequest.setTimeZone("UTC+8");
+
+        PddServiceConsoCoBizActionNotifyRequest.Result notifyResult = new PddServiceConsoCoBizActionNotifyRequest.Result();
+        if (action == "begin_pick") {
+            notifyRequest.setBizActionDesc("开始拣货");
+            notifyResult.setCode(0);
+        } else if (action == "finish_pick") {
+
+            notifyRequest.setBizActionDesc("拣货完成");
+            notifyResult.setCode(0);
+        } else if (action == "finish_unpack") {
+
+            notifyRequest.setBizActionDesc("拆包完成");
+            notifyRequest.setUnpackRemark("");
+            notifyResult.setCode(0);
+            notifyRequest.setPackageInfos(new ArrayList<>());
+            PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
+            notifyRequest.getPackageInfos().add(packageInfo);
+            packageInfo.setWeight(finishUnpackRequest.getWeight());
+            packageInfo.setWidth(finishUnpackRequest.getWidth());
+            packageInfo.setHeight(finishUnpackRequest.getHeight());
+            packageInfo.setLength(finishUnpackRequest.getLength());
+            packageInfo.setActualWeight(finishUnpackRequest.getActualWeight());
+            packageInfo.setConsoType("SEA");
+            packageInfo.setGoodsType("NORMAL");
+        }
+        notifyRequest.setResult(notifyResult);
+
+
+        JYBaseRequestModel requestModel = new JYBaseRequestModel();
+        requestModel.setRequest(JSON.toJSONString(notifyRequest));
+        requestModel.setRequest_id("" + new Date().getTime());
+        requestModel.setType("pdd.service.conso.co.biz.action.notify");
+        requestModel.setTarget_client_id(CLIENT_ID);
+        requestModel.setClient_id(CLIENT_ID);
+        long time = new Date().getTime() / 1000;
+        requestModel.setTimestamp(time);
+        requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPost(requestModel);
+
+        //更新collect_mail_detail
+        Boolean result = collectMailDetailImpl.updateByMailNo(finishUnpackRequest.getMailNo(), action);
+
+//        ioEntity.setReq(JSON.toJSONString(requestModel));
+//        ioEntity.setResp(resp);
+//        logOrderIoImpl.save(ioEntity);
+    }
+
+    /*拣货完成后出库*/
+    @PostMapping("/outBound")
+    public JSONObject outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) {
+        PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
+
+        List<OutBoundRequest.OutBoundList> outBoundList = outBoundRequest.getOutBound();
+
+        //获取所有可出库订单
+        List<CollectOutMailDetailResponse> list = collectOutMailDetailImpl.getListByOrderCode(outBoundRequest.getOrderCode());
+        for(CollectOutMailDetailResponse lists: list){
+            for(OutBoundRequest.OutBoundList outBoundLists: outBoundList ){
+                if(lists.getMailNo().equals(outBoundLists.getMailNo())){
+                    list.remove(outBoundList);
+                    outBoundRequest.getOutBound().remove(outBoundList);
+                }
+            }
+        }
+
+        if(list.size()>0 || outBoundList.size() > 0){
+            //出库信息与已存信息不匹配，无法出库
+
+            return JsonResponse.generateLocalCommonFailedResponse("-1", "出库单数异常");
+        }
+
+/*
+        LogOrderIoEntity ioEntity = new LogOrderIoEntity();
+        ioEntity.setLogisticsOrderCode(mailNoResponse.getLogisticsOrderCode());
+        ioEntity.setExpressCode(mailNoResponse.getExpressCode());
+        ioEntity.setMailNo(mailNoResponse.getMailNo());
+        ioEntity.setStatus(50);
+*/
+        CollectOrderResponse collectOrderResponse = collectOrderImpl.getByOrderCode(outBoundRequest.getOrderCode());
+
+        notifyRequest.setProviderCode(PROVIDER_CODE);
+        notifyRequest.setOrderCode(outBoundRequest.getOrderCode());
+        notifyRequest.setSegmentCode(collectOrderResponse.getSegmentCode());
+        notifyRequest.setExecuteTime(timeTool.getNowString());
+        notifyRequest.setTimeZone("UTC+8");
+        notifyRequest.setIsSplitOut("N");
+        notifyRequest.setPackageInfos(new ArrayList<>());
+
+
+        PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
+        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());
+
+        CollectOrderSendEntity collectOrderSendEntity = collectOrderSendImpl.getInfo();
+
+        notifyRequest.getSenderDetail().setName(collectOrderSendEntity.getName());
+        notifyRequest.getSenderDetail().setTelePhone(collectOrderSendEntity.getTelePhone());
+        notifyRequest.getSenderDetail().setCountry(collectOrderSendEntity.getCountry());
+        notifyRequest.getSenderDetail().setProvince(collectOrderSendEntity.getProvince());
+        notifyRequest.getSenderDetail().setCity(collectOrderSendEntity.getCity());
+        notifyRequest.getSenderDetail().setDistrict(collectOrderSendEntity.getDistrict());
+        notifyRequest.getSenderDetail().setDetailAddress(collectOrderSendEntity.getDetailAddress());
+
+
+        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByMailNo(outBoundRequest.getOrderCode());
+        notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
+        notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
+        notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
+        notifyRequest.getReceiverDetail().setCountry(collectReceiverDetailEntity.getCountry());
+        notifyRequest.getReceiverDetail().setProvince(collectReceiverDetailEntity.getProvince());
+        notifyRequest.getReceiverDetail().setCity(collectReceiverDetailEntity.getCity());
+        notifyRequest.getReceiverDetail().setDistrict(collectReceiverDetailEntity.getDistrict());
+        notifyRequest.getReceiverDetail().setDetailAddress(collectReceiverDetailEntity.getDetailAddress());
+
+        notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
+        notifyRequest.getResult().setCode(0);
+
+
+        log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
+        JYBaseRequestModel requestModel = new JYBaseRequestModel();
+        requestModel.setRequest(JSON.toJSONString(notifyRequest));
+        requestModel.setRequest_id("" + new Date().getTime());
+        requestModel.setType("pdd.service.conso.outbound");
+        requestModel.setTarget_client_id(CLIENT_ID);
+        requestModel.setClient_id(CLIENT_ID);
+        long time = new Date().getTime() / 1000;
+        requestModel.setTimestamp(time);
+        requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
+        String resp = PddHttpTool.sendJsonPost(requestModel);
+
+        return JsonResponse.generateOpenCommonSuccessResponse();
+    }
+
+
+//    /*流水查询*/
+//    @PostMapping("/logOrderIoSelect")
+//    public JSONObject logOrderIoSelect(HttpServletRequest request, @RequestBody LogOrderIoRequest param) {
+//        return JsonResponse.generateLocalCommonSuccessResponse(logOrderIoImpl.getListByRequest(param));
+//    }
+
+}

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