commit

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

@@ -9,6 +9,7 @@ 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.CollectOrderSendEntity;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
 import org.ta.pddserver.entity.CollectReceiverDetailEntity;
 import org.ta.pddserver.model.api.request.*;
@@ -41,7 +42,11 @@ public class PddLocalController {
     TimeTool timeTool;
 
     @Resource
-    CollectcOutMailDetailImpl  collectcOutMailDetailImpl;
+    CollectOutMailDetailImpl  collectOutMailDetailImpl;
+
+    @Resource
+    CollectOrderSendImpl  collectOrderSendImpl;
+
 
     private static final String PROVIDER_CODE = "HAIJI_KR";
     private static final String WAREHOUSE_CODE = "HJJY001";
@@ -49,6 +54,8 @@ public class PddLocalController {
     private static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
     @Autowired
     private CollectReceiverDetailImpl collectReceiverDetailImpl;
+    @Autowired
+    private CollectMailDetailImpl collectMailDetailImpl;
 
 
     /*集运单列表*/
@@ -122,6 +129,9 @@ public class PddLocalController {
         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);
     }
 
     /*入库*/
@@ -216,6 +226,9 @@ public class PddLocalController {
         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);
     }
 
     /*拣货完成后出库*/
@@ -223,36 +236,45 @@ public class PddLocalController {
     public void outBound(HttpServletRequest request, @RequestBody OutBoundRequest outBoundRequest) {
         PddServiceConsoOutboundRequest notifyRequest = new PddServiceConsoOutboundRequest();
 
-        CollectOutMailDetailEntity collectOutMailDetailEntity = collectcOutMailDetailImpl.getInfoByMailNo(outBoundRequest.getMailNo());
+
 
         notifyRequest.setProviderCode(PROVIDER_CODE);
-        notifyRequest.setOrderCode(collectOutMailDetailEntity.getOrderCode());
-        notifyRequest.setSegmentCode("SENDTORECEVER");
+        notifyRequest.setOrderCode(outBoundRequest.getOrderCode());
+        notifyRequest.setSegmentCode(outBoundRequest.getSegmentCode());
         notifyRequest.setExecuteTime(timeTool.getNowString());
         notifyRequest.setTimeZone("UTC+8");
         notifyRequest.setIsSplitOut("N");
         notifyRequest.setPackageInfos(new ArrayList<>());
+
+        for(OutBoundRequest.OutBoundList outBoundList: outBoundRequest.getOutBound()){
+            CollectOutMailDetailEntity collectOutMailDetailEntity = collectOutMailDetailImpl.getInfoByMailNo(outBoundList.getMailNo());
+
             PddServiceConsoOutboundRequest.PackageInfo packageInfo = new PddServiceConsoOutboundRequest.PackageInfo();
             notifyRequest.getPackageInfos().add(packageInfo);
-        packageInfo.setOutboundMailNo(outBoundRequest.getMailNo());
-        packageInfo.setExpressCode(outBoundRequest.getExpressCode());
-        packageInfo.setPackageType(outBoundRequest.getPackageType());
+            packageInfo.setOutboundMailNo(outBoundList.getMailNo());
+            packageInfo.setExpressCode(outBoundList.getExpressCode());
+            packageInfo.setPackageType(outBoundList.getPackageType());
             packageInfo.setLength(collectOutMailDetailEntity.getLength());
             packageInfo.setWidth(collectOutMailDetailEntity.getWidth());
             packageInfo.setHeight(collectOutMailDetailEntity.getHeight());
             packageInfo.setWeight(collectOutMailDetailEntity.getWeight());
+        }
+
 
         notifyRequest.setSenderDetail(new PddServiceConsoOutboundRequest.SenderDetail());
-        notifyRequest.getSenderDetail().setName("海际集货仓");
-        notifyRequest.getSenderDetail().setTelePhone("18660975251");
-        notifyRequest.getSenderDetail().setCountry("CN");
-        notifyRequest.getSenderDetail().setProvince("山东省");
-        notifyRequest.getSenderDetail().setCity("临沂市");
-        notifyRequest.getSenderDetail().setDistrict("兰山区");
-        notifyRequest.getSenderDetail().setDetailAddress("山东省临沂市兰山区横九路与纵十路交汇兰山财金智慧云仓五期二层二号仓");
+
+        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(collectOutMailDetailEntity.getOrderCode());
+        CollectReceiverDetailEntity collectReceiverDetailEntity = collectReceiverDetailImpl.getInfoByMailNo(outBoundRequest.getOrderCode());
         notifyRequest.setReceiverDetail(new PddServiceConsoOutboundRequest.ReceiverDetail());
         notifyRequest.getReceiverDetail().setName(collectReceiverDetailEntity.getName());
         notifyRequest.getReceiverDetail().setTelePhone(collectReceiverDetailEntity.getTelePhone());
@@ -264,8 +286,6 @@ public class PddLocalController {
 
         notifyRequest.setResult(new PddServiceConsoOutboundRequest.Result());
         notifyRequest.getResult().setCode(0);
-//        notifyRequest.getResult().setDesc("");
-//        notifyRequest.getResult().setRemark("");
 
 
         log.info("derelictionRequest:{}", JSON.toJSONString(notifyRequest));
@@ -278,9 +298,6 @@ public class PddLocalController {
         long time = new Date().getTime() / 1000;
         requestModel.setTimestamp(time);
         requestModel.setSign(PddSignTool.generateSign(requestModel, CLIENT_SECRET));
-        log.info("requestModel:{}", JSON.toJSONString(requestModel));
-//        String resp = PddHttpTool.postRequest(requestModel);
         String resp = PddHttpTool.sendJsonPost(requestModel);
-        log.info("resp = {}", resp);
     }
 }

PddServer/src/main/java/org/ta/pddserver/entity/CollectOrderSendEntity.java

+package org.ta.pddserver.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("collect_order_send")
+public class CollectOrderSendEntity {
+
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+    @TableField(value = "status")
+    private Integer status;
+
+    @TableField(value = "state")
+    private Integer state;
+
+    @TableField(value = "name")
+    private String name;
+
+    @TableField(value = "telePhone")
+    private String telePhone;
+
+    @TableField(value = "country")
+    private String country;
+
+    @TableField(value = "province")
+    private String province;
+
+    @TableField(value = "city")
+    private String city;
+
+    @TableField(value = "district")
+    private String district;
+
+    @TableField(value = "detailAddress")
+    private String detailAddress;
+}

PddServer/src/main/java/org/ta/pddserver/entity/LogOrderMailDetailEntity.java

@@ -26,7 +26,7 @@ public class LogOrderMailDetailEntity {
     private String remarks;
 
     @TableField(value = "status")
-    private Integer status;
+    private String status;
 
     @TableField(value = "logisticsOrderCode")
     private String logisticsOrderCode;

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

@@ -2,6 +2,7 @@ package org.ta.pddserver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.ta.pddserver.entity.CollectMailDetailEntity;
@@ -13,4 +14,7 @@ public interface CollectMailDetailMapper extends BaseMapper<CollectMailDetailEnt
 
     @Update("UPDATE `collect_mail_detail` SET `status` = #{status} WHERE `uid` = #{uid};")
     int updateStatusByUid(int status, String uid);
+
+    @Update("UPDATE `collect_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo}")
+    Boolean updateByMailNo(@Param("mailNo") String mailNo, @Param("action") String action);
 }

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.ta.pddserver.entity.CollectOrderSendEntity;
+
+
+@Mapper
+public interface CollectOrderSendMapper extends BaseMapper<CollectOrderSendEntity> {
+
+    @Select("SELECT * FROM `collect_order_send` WHERE `state` > 0")
+    CollectOrderSendEntity getInfo();
+
+}

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

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.ta.pddserver.entity.CollectOutMailDetailEntity;
+
+@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);
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.ta.pddserver.entity.LogOrderMailDetailEntity;
 import org.ta.pddserver.model.api.response.LogOrderMailDetailListResponse;
 import org.ta.pddserver.model.api.response.MailNoResponse;
@@ -24,4 +25,7 @@ public interface LogOrderMailDetailMapper extends BaseMapper<LogOrderMailDetailE
 
     @Select("SELECT `uid`, `logisticsOrderCode` , `expressCode` ,`mailNo`, `updated` FROM `log_order_mail_detail` WHERE `mailNo` = #{mailNo} AND `state` > 0;")
     MailNoResponse getInfoByMailNo(@Param("mailNo") String mailNo, @Param("status") String status);
+
+    @Update("UPDATE `log_order_mail_detail` SET `status` = #{action} WHERE `mailNo` = #{mailNo};")
+    Boolean updateByMailNo(@Param("mailNo")String mailNo, @Param("action") String action);
 }

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

@@ -2,15 +2,31 @@ package org.ta.pddserver.model.api.request;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class OutBoundRequest {
 
+    private List<OutBoundList> outBound;
+
+    private String orderCode;
+
+    // 派送段
+    //退回卖家：RETURNSELLER
+    //送往收货人：SENDTORECEVER
+    private String segmentCode;
+
+    /**
+     * 包裹详情
+     */
+    @Data
+    public static class OutBoundList {
         private String mailNo;
 
         private String expressCode;
 
-    private String orderCode;
-
         private String packageType;
 
+    }
+
 }

PddServer/src/main/java/org/ta/pddserver/service/CollectOrderSendService.java

+package org.ta.pddserver.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.ta.pddserver.entity.CollectOrderSendEntity;
+
+public interface CollectOrderSendService extends IService<CollectOrderSendEntity> {
+
+}

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

@@ -18,4 +18,8 @@ public class CollectMailDetailImpl extends ServiceImpl<CollectMailDetailMapper,
     public int updateStatusByUid(int status, String uid) {
         return baseMapper.updateStatusByUid(status, uid);
     }
+
+    public Boolean updateByMailNo(String mailNo, String action) {
+        return baseMapper.updateByMailNo(mailNo, action);
+    }
 }
\ No newline at end of file

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

+package org.ta.pddserver.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.ta.pddserver.entity.CollectOrderSendEntity;
+import org.ta.pddserver.mapper.CollectOrderSendMapper;
+import org.ta.pddserver.service.CollectOrderSendService;
+
+@Service
+public class CollectOrderSendImpl extends ServiceImpl<CollectOrderSendMapper, CollectOrderSendEntity> implements CollectOrderSendService {
+
+    public CollectOrderSendEntity getInfo() {
+        return baseMapper.getInfo();
+    }
+}
\ No newline at end of file

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

@@ -3,13 +3,12 @@ package org.ta.pddserver.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.ta.pddserver.entity.CollectOrderDetailEntity;
 import org.ta.pddserver.entity.CollectOutMailDetailEntity;
-import org.ta.pddserver.mapper.CollectOrderDetailMapper;
-import org.ta.pddserver.service.CollectOrderDetailService;
+import org.ta.pddserver.mapper.CollectOutMailDetailMapper;
+import org.ta.pddserver.service.CollectOutMailDetailService;
 
 @Service
-public class CollectcOutMailDetailImpl extends ServiceImpl<CollectOrderDetailMapper, CollectOrderDetailEntity> implements CollectOrderDetailService {
+public class CollectOutMailDetailImpl extends ServiceImpl<CollectOutMailDetailMapper, CollectOutMailDetailEntity> implements CollectOutMailDetailService {
 
 
     public CollectOutMailDetailEntity getInfoByMailNo(String mailNo) {

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

@@ -15,6 +15,10 @@ import java.util.List;
 @Service
 public class LogOrderMailDetailImpl extends ServiceImpl<LogOrderMailDetailMapper, LogOrderMailDetailEntity> implements LogOrderMailDetailService {
 
+    public Boolean updateByMailNo(String mailNo, String action) {
+       return baseMapper.updateByMailNo(mailNo, action);
+    }
+
     public List<LogOrderMailDetailEntity> getListByCode(String logisticsOrderCode) {
         return baseMapper.getListByCode(logisticsOrderCode);
     }