提交修改

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java

@@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
 /**
 *订单表状态变更记录
 * @author quyixiao
-* @since 2025-11-16
+* @since 2025-11-18
 */
 
 @Data
@@ -33,6 +33,7 @@ private static final long serialVersionUID = 1L;
     public final static String change_status_user = CLASS_NAME + "change_status_user";      // 改变这个状态的用户
     public final static String trace_id = CLASS_NAME + "trace_id";                          // 日志编号
     public final static String status_desc = CLASS_NAME + "status_desc";                    // 状态描述
+    public final static String type_ = CLASS_NAME + "type";                                 // 正向状态变更还是逆向状态变更
     //
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -58,6 +59,8 @@ private static final long serialVersionUID = 1L;
     private String traceId;
     //状态描述
     private String statusDesc;
+    //正向状态变更还是逆向状态变更
+    private String type;
     /**
      *  
      * @return
@@ -238,6 +241,21 @@ private static final long serialVersionUID = 1L;
         this.statusDesc = statusDesc;
     }
 
+    /**
+     * 正向状态变更还是逆向状态变更 
+     * @return
+     */
+    public String getType() {
+        return type;
+    }
+    /**
+     * 正向状态变更还是逆向状态变更 
+     * @param type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "VvTradeOrderLineStatusLogEntity{" +
@@ -253,6 +271,7 @@ private static final long serialVersionUID = 1L;
                 ",changeStatusUser=" + changeStatusUser +
                 ",traceId=" + traceId +
                 ",statusDesc=" + statusDesc +
+                ",type=" + type +
                 "}";
     }
 }

api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AdminPackageDTO.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.mm.order.resp;
+package com.heyu.api.data.kuaidi100;
 
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;

api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AppPackageDTO.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.mm.order.resp;
+package com.heyu.api.data.kuaidi100;
 
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
@@ -11,12 +11,25 @@ import java.util.List;
 @Data
 public class AppPackageDTO extends VvPackageEntity {
 
+    /***
+     * 子单信息
+     */
     private List<VvTradeOrderLineDO> vvTradeOrderLineDOList = new ArrayList<>();
 
-
+    /***
+     * 操作信息
+     */
     private List<OrderActionDTO>  orderActionList;
 
 
+    /***
+     * 订单信息
+     */
     private VvTradeOrderEntity tradeOrderEntity;
 
+    /***
+     * 包裹信息
+     */
+    private VvPackageEntity vvPackageEntity;
+
 }

api-mapper/src/main/java/com/heyu/api/data/kuaidi100/OrderActionDTO.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.mm.order.resp;
+package com.heyu.api.data.kuaidi100;
 
 
 import lombok.Data;

api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VVOrderListResp.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.mm.order.resp;
+package com.heyu.api.data.kuaidi100;
 
 
 import com.heyu.api.data.entity.vv.VvTradeOrderEntity;

api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VvTradeOrderLineDO.java

@@ -1,9 +1,8 @@
-package com.heyu.api.alibaba.request.mm.order.resp;
+package com.heyu.api.data.kuaidi100;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -16,4 +15,8 @@ public class VvTradeOrderLineDO extends VvTradeOrderLineEntity {
     private List<Long> mergeIdList ;
 
 
+
+
+
+
 }

api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl;
+package com.heyu.api.data.service.impl;
 
-import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
+import com.heyu.api.data.kuaidi100.OrderActionDTO;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.utils.CollectionUtils;
-import com.heyu.api.service.impl.order.*;
+import com.heyu.api.data.service.impl.order.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;

api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractReverseAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl;
+package com.heyu.api.data.service.impl;
 
-import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
+import com.heyu.api.data.kuaidi100.OrderActionDTO;
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.utils.CollectionUtils;
-import com.heyu.api.service.impl.reverse.*;
+import com.heyu.api.data.service.impl.reverse.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;

api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.vv;
+package com.heyu.api.data.service.impl;
 
 
 import lombok.Data;

api-mapper/src/main/java/com/heyu/api/data/service/impl/AppliyReverseRequest.java

@@ -1,8 +1,8 @@
-package com.heyu.api.alibaba.request.mm.reverse;
+package com.heyu.api.data.service.impl;
+
+
 
 
-import com.heyu.api.alibaba.request.mm.order.ResourceDTO;
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
 import lombok.Data;
 
 import java.math.BigDecimal;

api-mapper/src/main/java/com/heyu/api/data/service/impl/ResourceDTO.java

@@ -1,4 +1,4 @@
-package com.heyu.api.alibaba.request.mm.order;
+package com.heyu.api.data.service.impl;
 
 
 import lombok.Data;

api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderService.java

@@ -1,6 +1,6 @@
-package com.heyu.api.service;
+package com.heyu.api.data.service.impl;
+
 
-import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.utils.R;
 

api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java

@@ -1,15 +1,15 @@
-package com.heyu.api.service.impl;
+package com.heyu.api.data.service.impl;
 
 
 import com.heyu.api.data.enums.ReverseUploadSceneEnums;
-import com.heyu.api.alibaba.request.mm.order.ResourceDTO;
+
-import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
+
 import com.heyu.api.data.dao.vv.*;
 import com.heyu.api.data.entity.vv.*;
 import com.heyu.api.data.utils.BigDecimalUtil;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.data.utils.SanUtils;
-import com.heyu.api.service.ReverseOrderService;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyRefund.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class ApplyRefund extends AbstractOrderAction {
 

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyReturnRefund.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class ApplyReturnRefund extends AbstractOrderAction {
 

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class BuyerCloseReverseOrderAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerUploadReverseTrackNumberAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 
 public class BuyerUploadReverseTrackNumberAction extends AbstractOrderAction {

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CancelAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class CancelAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CloseAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class CloseAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeleteAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class DeleteAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeliveredAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class DeliveredAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ShippedAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class ShippedAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ToShippingAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class ToShippingAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/order/UnShippingAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl.order;
+package com.heyu.api.data.service.impl.order;
 
 
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.OrderStatusEnums;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 
 public class UnShippingAction extends AbstractOrderAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeCancelAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 /***
  * 卖家同意取消

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeRefundAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 /***
  * 卖家同意取消

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeReturnRefundAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 /***
  * 卖家同意取消

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeSignReceiptAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 public class SellerAgreeSignReceiptAction extends AbstractReverseAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerQaCheckFinishedAction.java

@@ -1,10 +1,10 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 public class SellerQaCheckFinishedAction extends AbstractReverseAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectCancelAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 
 /***

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectRefundAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 /***
  * 卖家同意取消

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectReturnRefundAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 /***
  *

api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectSignReceiptAction.java

@@ -1,9 +1,9 @@
-package com.heyu.api.service.impl.reverse;
+package com.heyu.api.data.service.impl.reverse;
 
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.enums.OrderActionEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 
 public class SellerRejectSignReceiptAction extends AbstractReverseAction {
     @Override

api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java

@@ -13,17 +13,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.heyu.api.data.dao.vv.VvPackageDao;
 import com.heyu.api.data.dao.vv.VvReverseOrderDao;
+import com.heyu.api.data.dao.vv.VvReverseOrderLineDao;
 import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
 import com.heyu.api.data.dto.PackageDelivedDelayDTO;
 import com.heyu.api.data.dto.vv.KuaiDi100DTO;
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
+import com.heyu.api.data.entity.vv.VvReverseOrderLineEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.*;
 import com.heyu.api.data.kuaidi100.KuaiDi100Utils;
 import com.heyu.api.data.kuaidi100.LogisticsMapUtils;
 import com.heyu.api.data.service.vv.VvPackageService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
+import com.heyu.api.data.utils.CollectionUtils;
 import com.heyu.api.data.utils.DateUtils;
+import com.heyu.api.data.utils.SanUtils;
 import com.heyu.api.data.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.MessageDeliveryMode;
@@ -61,6 +66,12 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
     @Autowired
     private VvReverseOrderDao vvReverseOrderDao;
 
+    @Autowired
+    private VvReverseOrderLineDao vvReverseOrderLineDao;
+
+    @Autowired
+    private VvTradeOrderConvertService vvTradeOrderConvertService;
+
 
     @Override
     public VvPackageEntity selectVvPackageById(Long id) {
@@ -163,18 +174,35 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
                                     tradeOrderLineEntity.setState(kuaiDi100DTO.getState());
                                     tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
 
+                                    vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                                            OrderStatusEnums.shipped,
+                                            RoleEnums.system.getRole(),
+                                            OrderStatusEnums.shipped.getDesc()
 
-
+                                    );
-
-
-
-
-
-
                                 }
                             } else {
                                 VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderByTrackNumber(trackNumber);
                                 vvReverseOrderEntity.setStatus(ReverseStatusEnums.shipped.getStatus());
+                                vvReverseOrderEntity.setGmtShipped(new Date());
+                                vvReverseOrderEntity.setShippedUser(RoleEnums.system.getRole());
+                                List<VvReverseOrderLineEntity> vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId());
+
+                                List<Long> tradeOrderLineIdList = SanUtils.getFieldList(vvReverseOrderLineEntities,VvReverseOrderLineEntity::getTradeOrderLineId );
+
+                                if(CollectionUtils.isNotEmpty(tradeOrderLineIdList)){
+                                    List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = tradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIdList);
+                                    for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
+                                        tradeOrderLineEntity.setReverseStatus(ReverseStatusEnums.shipped.getStatus());
+                                        tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+                                        vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                                                ReverseStatusEnums.shipped,
+                                                RoleEnums.system.getRole(),
+                                                ReverseStatusEnums.shipped.getDesc()
+                                        );
+                                    }
+                                }
                             }
                         }
                     }

api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java

@@ -1,9 +1,5 @@
-package com.heyu.api.service.impl;
+package com.heyu.api.data.service.impl.vv;
 
-import com.heyu.api.alibaba.request.mm.order.resp.AdminPackageDTO;
-import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
-import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
-import com.heyu.api.alibaba.request.mm.order.resp.VvTradeOrderLineDO;
 import com.heyu.api.common.LogAspect;
 import com.heyu.api.data.dao.vv.VvPackageDao;
 import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao;
@@ -13,8 +9,11 @@ import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
 import com.heyu.api.data.enums.OrderStatusEnums;
 import com.heyu.api.data.enums.ReverseStatusEnums;
+import com.heyu.api.data.kuaidi100.*;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
+import com.heyu.api.data.utils.CollectionUtils;
 import com.heyu.api.data.utils.SanUtils;
-import com.heyu.api.service.VvTradeOrderConvertService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -99,23 +98,47 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
         if (status instanceof OrderStatusEnums) {
             entity.setStatus(((OrderStatusEnums) status).getStatus());
             entity.setStatusDesc(((OrderStatusEnums) status).getDesc());
+            entity.setType("正向");
         } else if (status instanceof ReverseStatusEnums) {
             entity.setStatus(((ReverseStatusEnums) status).getStatus());
             entity.setStatusDesc(((ReverseStatusEnums) status).getDesc());
+            entity.setType("逆向");
         }
-
         entity.setChangeStatusUser(changeStatusUser);
-
         if (reason != null && reason.length > 0) {
             entity.setReason(reason[0]);
             if (reason.length > 1) {
                 entity.setFeatures(reason[1]);
             }
         }
-
         entity.setTraceId(LogAspect.threadLocalNo.get());
         vvTradeOrderLineStatusLogDao.insertVvTradeOrderLineStatusLog(entity);
         return 1;
     }
 
+    @Override
+    public List<AppPackageDTO> buildAppPackageDTO(List<VVOrderListResp> vvOrderListResps) {
+        List<AppPackageDTO> appPackageDTOList = new ArrayList<>();
+        for (VVOrderListResp vvOrderListResp : vvOrderListResps) {
+            VvTradeOrderEntity vvTradeOrderEntity = new VvTradeOrderEntity();
+            BeanUtils.copyProperties(vvOrderListResp, vvTradeOrderEntity);
+            if (CollectionUtils.isNotEmpty(vvOrderListResp.getPackageList())) {
+                for (AdminPackageDTO adminPackageDTO : vvOrderListResp.getPackageList()) {
+                    AppPackageDTO appPackageDTO = new AppPackageDTO();
+
+                    appPackageDTO.setVvTradeOrderLineDOList(adminPackageDTO.getVvTradeOrderLineDOList());
+                    appPackageDTO.setOrderActionList(adminPackageDTO.getOrderActionList());
+                    appPackageDTO.setTradeOrderEntity(vvTradeOrderEntity);
+
+                    VvPackageEntity vvPackageEntity = new VvPackageEntity();
+                    BeanUtils.copyProperties(adminPackageDTO, vvPackageEntity);
+                    appPackageDTO.setVvPackageEntity(vvPackageEntity);
+
+                    appPackageDTOList.add(appPackageDTO);
+                }
+            }
+        }
+        return appPackageDTOList;
+    }
+
 }

api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java

@@ -1,8 +1,10 @@
-package com.heyu.api.service;
+package com.heyu.api.data.service.vv;
+
 
-import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
 import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
+import com.heyu.api.data.kuaidi100.AppPackageDTO;
+import com.heyu.api.data.kuaidi100.VVOrderListResp;
 
 import java.util.List;
 
@@ -22,4 +24,5 @@ public interface VvTradeOrderConvertService {
     );
 
 
+    List<AppPackageDTO> buildAppPackageDTO(List<VVOrderListResp> vvOrderListResps);
 }

api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java

@@ -49,9 +49,9 @@ public class MysqlMain_update {
         List<TablesBean> list = new ArrayList<TablesBean>();
 
 
-        list.add(new TablesBean("vv_trade_order_line"));
 
-        list.add(new TablesBean("vv_trade_order"));
+
+        list.add(new TablesBean("vv_trade_order_line_status_log"));
 
 
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java

@@ -1,6 +1,6 @@
 package com.heyu.api.alibaba.request.mm;
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm;
 
 import com.alibaba.fastjson.JSON;
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppCloseDTO.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvSettleProveDTO.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order;
 
 
+import com.heyu.api.data.service.impl.ResourceDTO;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java

@@ -37,7 +37,7 @@ public class VvToShippingDTO extends AdminBaseDTO {
 
         VvToShippingDTO vvToPackDTO = new VvToShippingDTO();
         List<Long> tradeOrderLineIds = new ArrayList<>();
-        tradeOrderLineIds.add(202511172478L);
+        tradeOrderLineIds.add(202511172477L);
 
         List<String> packageImageUrls = new ArrayList<>();
         packageImageUrls.add("ioewoie");
@@ -48,10 +48,6 @@ public class VvToShippingDTO extends AdminBaseDTO {
         vvToPackDTO.setPackageImageUrls(packageImageUrls);
         vvToPackDTO.setLogisticsCompany("极兔");
 
-        //vvToPackDTO.setShippingFrom("浙江 ");
-
-//        vvToPackDTO.setShippingAmount(new BigDecimal("0.01"));
-
         System.out.println(JSON.toJSONString(vvToPackDTO));
 
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderDetailDTO.java

@@ -0,0 +1,22 @@
+package com.heyu.api.alibaba.request.mm.order.resp;
+
+
+import com.heyu.api.data.service.impl.AppBaseRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppTradeOrderDetailDTO extends AppBaseRequest {
+
+
+    /***
+     * 子订单列表
+     */
+    private List<Long> tradeOrderLineIdList;
+
+
+
+
+
+}

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java

@@ -2,6 +2,7 @@ package com.heyu.api.alibaba.request.mm.order.resp;
 
 
 import com.heyu.api.data.entity.vv.VvBuyerEntity;
+import com.heyu.api.data.kuaidi100.VVOrderListResp;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order.resp;
 
 import com.alibaba.fastjson.JSON;
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderCancelDTO.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order.resp;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java

@@ -3,7 +3,7 @@ package com.heyu.api.alibaba.request.mm.order.resp;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order.resp;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderShippedDTO.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.order.resp;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java

@@ -1,7 +1,7 @@
 package com.heyu.api.alibaba.request.mm.reverse;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java

@@ -1,8 +1,8 @@
 package com.heyu.api.alibaba.request.mm.reverse;
 
 
-import com.heyu.api.alibaba.request.mm.order.ResourceDTO;
+import com.heyu.api.data.service.impl.ResourceDTO;
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java

@@ -2,7 +2,7 @@ package com.heyu.api.alibaba.request.mm.reverse;
 
 
 import com.heyu.api.alibaba.request.mm.AdminBaseDTO;
-import com.heyu.api.alibaba.request.mm.order.ResourceDTO;
+import com.heyu.api.data.service.impl.ResourceDTO;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvReverseOrderDTO.java

@@ -1,6 +1,6 @@
 package com.heyu.api.alibaba.request.mm.reverse;
 
-import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
+import com.heyu.api.data.kuaidi100.OrderActionDTO;
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
 import com.heyu.api.data.entity.vv.VvReverseOrderLineEntity;

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java

@@ -2,6 +2,7 @@ package com.heyu.api.alibaba.request.vv;
 
 
 import com.alibaba.fastjson.JSON;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 import java.util.ArrayList;

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 import com.alibaba.fastjson.JSON;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppLinkRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppQrCodeRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppSchemeRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 import java.util.List;

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java

@@ -1,5 +1,6 @@
 package com.heyu.api.alibaba.request.vv;
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShortLinkRequest.java

@@ -1,6 +1,7 @@
 package com.heyu.api.alibaba.request.vv;
 
 
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import lombok.Data;
 
 @Data

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java

@@ -5,25 +5,26 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.heyu.api.alibaba.request.mm.VvUnShippingDTO;
 import com.heyu.api.alibaba.request.mm.order.*;
-import com.heyu.api.alibaba.request.mm.order.resp.AdminPackageDTO;
+import com.heyu.api.data.kuaidi100.AdminPackageDTO;
 import com.heyu.api.alibaba.request.mm.order.resp.VVOrderDetailResp;
-import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
+import com.heyu.api.data.kuaidi100.VVOrderListResp;
-import com.heyu.api.alibaba.request.mm.order.resp.VvTradeOrderLineDO;
+import com.heyu.api.data.kuaidi100.VvTradeOrderLineDO;
-import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
+import com.heyu.api.data.service.impl.AppliyReverseRequest;
 import com.heyu.api.common.annotation.Describe;
 import com.heyu.api.data.dao.vv.*;
 import com.heyu.api.data.dto.PackageDelivedDelayDTO;
 import com.heyu.api.data.entity.vv.*;
 import com.heyu.api.data.enums.*;
+import com.heyu.api.data.service.impl.ResourceDTO;
 import com.heyu.api.data.utils.BigDecimalUtil;
 import com.heyu.api.data.utils.DateUtils;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.data.utils.SanUtils;
 import com.heyu.api.jsapi.JsapiPrepay;
 import com.heyu.api.jsapi.dto.refund.Refund;
-import com.heyu.api.service.ReverseOrderService;
+import com.heyu.api.data.service.impl.ReverseOrderService;
-import com.heyu.api.service.VvTradeOrderConvertService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
-import com.heyu.api.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
 import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java

@@ -3,7 +3,7 @@ package com.heyu.api.controller.mm;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
+import com.heyu.api.data.kuaidi100.OrderActionDTO;
 import com.heyu.api.alibaba.request.mm.reverse.VvApproveRequest;
 import com.heyu.api.alibaba.request.mm.reverse.VvReverseListRequest;
 import com.heyu.api.alibaba.request.mm.reverse.VvReverseOrderDTO;
@@ -18,8 +18,8 @@ import com.heyu.api.data.utils.SanUtils;
 import com.heyu.api.data.utils.StringUtils;
 import com.heyu.api.jsapi.JsapiPrepay;
 import com.heyu.api.jsapi.dto.refund.Refund;
-import com.heyu.api.service.VvTradeOrderConvertService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
-import com.heyu.api.service.impl.AbstractReverseAction;
+import com.heyu.api.data.service.impl.AbstractReverseAction;
 import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.heyu.api.alibaba.request.mm.order.AppCloseDTO;
 import com.heyu.api.alibaba.request.mm.order.AppDeliveredDTO;
 import com.heyu.api.alibaba.request.mm.order.resp.*;
-import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
 import com.heyu.api.alibaba.request.vv.AppOrderRequest;
 import com.heyu.api.common.annotation.AppLogin;
 import com.heyu.api.common.annotation.Describe;
@@ -14,19 +13,22 @@ import com.heyu.api.data.dao.vv.*;
 import com.heyu.api.data.dto.WeiXinPayDelayDTO;
 import com.heyu.api.data.entity.vv.*;
 import com.heyu.api.data.enums.*;
+import com.heyu.api.data.kuaidi100.AppPackageDTO;
+import com.heyu.api.data.kuaidi100.VVOrderListResp;
+import com.heyu.api.data.service.impl.AbstractOrderAction;
+import com.heyu.api.data.service.impl.AppliyReverseRequest;
+import com.heyu.api.data.service.impl.ReverseOrderService;
+import com.heyu.api.data.service.vv.VvPackageService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
 import com.heyu.api.data.utils.*;
 import com.heyu.api.jsapi.JsapiPrepay;
 import com.heyu.api.jsapi.dto.pay.DirectAPIv3JsapiPrepayResponse;
 import com.heyu.api.jsapi.dto.pay.WxPayVO;
-import com.heyu.api.service.ReverseOrderService;
-import com.heyu.api.service.VvTradeOrderConvertService;
-import com.heyu.api.service.impl.AbstractOrderAction;
 import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.MessageDeliveryMode;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -101,6 +103,9 @@ public class AppOrderController {
     @Autowired
     private VvProductPropertyDao vvProductPropertyDao;
 
+    @Autowired
+    private VvPackageService vvPackageService;
+
 
     /***
      * https://api.1024api.com/api-interface/app/order/list
@@ -142,22 +147,34 @@ public class AppOrderController {
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = vvTradeOrderLineDao.selectAppTradeOrderByTradeOrderIds(tradeOrderIds);
 
         List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, vvTradeOrderLineEntities, true);
-        List<AppPackageDTO> appPackageDTOList = new ArrayList<>();
-        for (VVOrderListResp vvOrderListResp : vvOrderListResps) {
-            VvTradeOrderEntity vvTradeOrderEntity = new VvTradeOrderEntity();
-            BeanUtils.copyProperties(vvOrderListResp, vvTradeOrderEntity);
-            if (CollectionUtils.isNotEmpty(vvOrderListResp.getPackageList())) {
-                for (AdminPackageDTO adminPackageDTO : vvOrderListResp.getPackageList()) {
-                    AppPackageDTO appPackageDTO = new AppPackageDTO();
 
-                    appPackageDTO.setVvTradeOrderLineDOList(adminPackageDTO.getVvTradeOrderLineDOList());
+        List<AppPackageDTO> appPackageDTOList =  vvTradeOrderConvertService.buildAppPackageDTO(vvOrderListResps);
-                    appPackageDTO.setOrderActionList(adminPackageDTO.getOrderActionList());
-                    appPackageDTO.setTradeOrderEntity(vvTradeOrderEntity);
 
-                    appPackageDTOList.add(appPackageDTO);
+        return R.ok().setData(appPackageDTOList);
-                }
+    }
+
+
+    /***
+     *  订单添加
+     *
+     *  http://localhost:8888/app/order/detail
+     */
+    @Describe("订单详情")
+    @RequestMapping("/detail")
+    public R detail(@RequestBody AppTradeOrderDetailDTO vvOrderRequest) {
+        List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIdList());
+        List<String> trackNumbers = SanUtils.field2Set2List(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTrackNumber);
+        if (CollectionUtils.isNotEmpty(trackNumbers)) {
+            for (String trackNumber : trackNumbers) {
+                vvPackageService.selectVvKuaidiAndUpdateData(trackNumber, RoleEnums.user.getRole());
             }
         }
+
+        List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId);
+        // 拿到订单的顺序
+        List<VvTradeOrderEntity> tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds);
+        List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, vvTradeOrderLineEntities, true);
+        List<AppPackageDTO> appPackageDTOList = vvTradeOrderConvertService.buildAppPackageDTO(vvOrderListResps);
         return R.ok().setData(appPackageDTOList);
     }
 

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java

@@ -2,10 +2,10 @@ package com.heyu.api.controller.vv;
 
 
 import com.alibaba.fastjson.JSON;
-import com.heyu.api.alibaba.request.mm.order.ResourceDTO;
+import com.heyu.api.data.service.impl.ResourceDTO;
 import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseCloseRequest;
 import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseProveRequest;
-import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest;
+import com.heyu.api.data.service.impl.AppliyReverseRequest;
 import com.heyu.api.common.annotation.AppLogin;
 import com.heyu.api.common.annotation.Describe;
 import com.heyu.api.data.dao.vv.*;
@@ -16,8 +16,8 @@ import com.heyu.api.data.enums.ShippingTypeEnums;
 import com.heyu.api.data.utils.NumberUtil;
 import com.heyu.api.data.utils.R;
 import com.heyu.api.data.utils.SanUtils;
-import com.heyu.api.service.ReverseOrderService;
+import com.heyu.api.data.service.impl.ReverseOrderService;
-import com.heyu.api.service.VvTradeOrderConvertService;
+import com.heyu.api.data.service.vv.VvTradeOrderConvertService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppScrollController.java

@@ -1,7 +1,7 @@
 package com.heyu.api.controller.vv;
 
 
-import com.heyu.api.alibaba.request.vv.AppBaseRequest;
+import com.heyu.api.data.service.impl.AppBaseRequest;
 import com.heyu.api.common.annotation.Describe;
 import com.heyu.api.data.dao.vv.VvScrollConfigDao;
 import com.heyu.api.data.entity.vv.VvScrollConfigEntity;

api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java

@@ -25,15 +25,10 @@ public class PackageUpdateJob {
     private VvPackageService vvPackageService;
 
     public void run() {
-
-
         List<VvPackageEntity> vvPackageEntityList = vvPackageDao.selectVvPackageByIsCheckNotIN(Arrays.asList("2", "3"));
 
         for (VvPackageEntity vvPackageEntity : vvPackageEntityList) {
-
             vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.job.getRole());
         }
-
-
     }
 }

api-web/api-interface/src/test/java/com/api/test/Test4.java

@@ -1,7 +1,7 @@
 package com.api.test;
 
 import com.alibaba.fastjson.JSON;
-import com.heyu.api.alibaba.request.mm.order.resp.VvTradeOrderLineDO;
+import com.heyu.api.data.kuaidi100.VvTradeOrderLineDO;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.utils.MD5Utils;
 import com.heyu.api.data.utils.SanUtils;