提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineStatusLogDao.java

@@ -0,0 +1,36 @@
+package com.heyu.api.data.dao.vv;
+/**
+* <p>
+* 订单表状态变更记录 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
+public interface VvTradeOrderLineStatusLogDao extends BaseMapper<VvTradeOrderLineStatusLogEntity> {
+
+
+	VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(@Param("id")Long id);
+
+
+	Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int deleteVvTradeOrderLineStatusLogById(@Param("id")Long id);
+
+
+}

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

@@ -0,0 +1,239 @@
+package com.heyu.api.data.entity.vv;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.lz.mybatis.plugin.annotations.AS;
+
+import java.math.BigDecimal;
+import java.util.Date;import java.util.Date;
+/**
+*订单表状态变更记录
+* @author quyixiao
+* @since 2025-11-16
+*/
+
+@Data
+@TableName("vv_trade_order_line_status_log")
+public class VvTradeOrderLineStatusLogEntity implements java.io.Serializable {
+private static final long serialVersionUID = 1L;
+
+    public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity:";
+
+    public final static String all = CLASS_NAME + "*";
+    public final static String id_ = CLASS_NAME + "id";                                     // 
+    public final static String is_delete = CLASS_NAME + "is_delete";                        // 是否删除：0 否 1 删除
+    public final static String create_time = CLASS_NAME + "create_time";                    // 创建时间
+    public final static String modify_time = CLASS_NAME + "modify_time";                    // 修改时间
+    public final static String trade_order_line_id = CLASS_NAME + "trade_order_line_id";    // 子订单号
+    public final static String status_ = CLASS_NAME + "status";                             // 状态
+    public final static String current_time = CLASS_NAME + "current_time";                  // 当前时间
+    public final static String reason_ = CLASS_NAME + "reason";                             // 原因
+    public final static String features_ = CLASS_NAME + "features";                         // 附加信息
+    public final static String change_status_user = CLASS_NAME + "change_status_user";      // 改变这个状态的用户
+    public final static String trace_id = CLASS_NAME + "trace_id";                          // 日志编号
+    //
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    //是否删除：0 否 1 删除
+    private Integer isDelete;
+    //创建时间
+    private Date createTime;
+    //修改时间
+    private Date modifyTime;
+    //子订单号
+    private Long tradeOrderLineId;
+    //状态
+    private String status;
+    //当前时间
+    private Date currentTime;
+    //原因
+    private String reason;
+    //附加信息
+    private String features;
+    //改变这个状态的用户
+    private String changeStatusUser;
+    //日志编号
+    private String traceId;
+    /**
+     *  
+     * @return
+     */
+    public Long getId() {
+        return id;
+    }
+    /**
+     *  
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 是否删除：0 否 1 删除 
+     * @return
+     */
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+    /**
+     * 是否删除：0 否 1 删除 
+     * @param isDelete
+     */
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    /**
+     * 创建时间 
+     * @return
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 创建时间 
+     * @param createTime
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 修改时间 
+     * @return
+     */
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+    /**
+     * 修改时间 
+     * @param modifyTime
+     */
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    /**
+     * 子订单号 
+     * @return
+     */
+    public Long getTradeOrderLineId() {
+        return tradeOrderLineId;
+    }
+    /**
+     * 子订单号 
+     * @param tradeOrderLineId
+     */
+    public void setTradeOrderLineId(Long tradeOrderLineId) {
+        this.tradeOrderLineId = tradeOrderLineId;
+    }
+
+    /**
+     * 状态 
+     * @return
+     */
+    public String getStatus() {
+        return status;
+    }
+    /**
+     * 状态 
+     * @param status
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 当前时间 
+     * @return
+     */
+    public Date getCurrentTime() {
+        return currentTime;
+    }
+    /**
+     * 当前时间 
+     * @param currentTime
+     */
+    public void setCurrentTime(Date currentTime) {
+        this.currentTime = currentTime;
+    }
+
+    /**
+     * 原因 
+     * @return
+     */
+    public String getReason() {
+        return reason;
+    }
+    /**
+     * 原因 
+     * @param reason
+     */
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    /**
+     * 附加信息 
+     * @return
+     */
+    public String getFeatures() {
+        return features;
+    }
+    /**
+     * 附加信息 
+     * @param features
+     */
+    public void setFeatures(String features) {
+        this.features = features;
+    }
+
+    /**
+     * 改变这个状态的用户 
+     * @return
+     */
+    public String getChangeStatusUser() {
+        return changeStatusUser;
+    }
+    /**
+     * 改变这个状态的用户 
+     * @param changeStatusUser
+     */
+    public void setChangeStatusUser(String changeStatusUser) {
+        this.changeStatusUser = changeStatusUser;
+    }
+
+    /**
+     * 日志编号 
+     * @return
+     */
+    public String getTraceId() {
+        return traceId;
+    }
+    /**
+     * 日志编号 
+     * @param traceId
+     */
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+    @Override
+    public String toString() {
+        return "VvTradeOrderLineStatusLogEntity{" +
+                ",id=" + id +
+                ",isDelete=" + isDelete +
+                ",createTime=" + createTime +
+                ",modifyTime=" + modifyTime +
+                ",tradeOrderLineId=" + tradeOrderLineId +
+                ",status=" + status +
+                ",currentTime=" + currentTime +
+                ",reason=" + reason +
+                ",features=" + features +
+                ",changeStatusUser=" + changeStatusUser +
+                ",traceId=" + traceId +
+                "}";
+    }
+}

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

@@ -19,10 +19,7 @@ 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.VvTradeOrderLineEntity;
-import com.heyu.api.data.enums.DelayTypeEnums;
+import com.heyu.api.data.enums.*;
-import com.heyu.api.data.enums.KuaiDi100StateEnums;
-import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.data.enums.ShippingTypeEnums;
 import com.heyu.api.data.kuaidi100.KuaiDi100Utils;
 import com.heyu.api.data.kuaidi100.LogisticsMapUtils;
 import com.heyu.api.data.service.vv.VvPackageService;
@@ -160,9 +157,20 @@ public class VvPackageServiceImpl extends ServiceImpl<VvPackageDao, VvPackageEnt
 
                                 List<VvTradeOrderLineEntity> tradeOrderLineEntities = tradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(trackNumber);
                                 for (VvTradeOrderLineEntity tradeOrderLineEntity : tradeOrderLineEntities) {
-                                    tradeOrderLineEntity.setGmtSignReceipt(time);
+                                    tradeOrderLineEntity.setShippedUser(RoleEnums.system.getRole());
+                                    tradeOrderLineEntity.setGmtShipped(new Date());
+                                    tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
                                     tradeOrderLineEntity.setState(kuaiDi100DTO.getState());
                                     tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+
+
+
+
+
+
+
+
                                 }
                             }else{
                                 VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderByTrackNumber(trackNumber);

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

@@ -0,0 +1,68 @@
+package com.heyu.api.data.service.impl.vv;
+/**
+* <p>
+* 订单表状态变更记录 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao;
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+import com.heyu.api.data.service.vv.VvTradeOrderLineStatusLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+public class VvTradeOrderLineStatusLogServiceImpl extends ServiceImpl<VvTradeOrderLineStatusLogDao, VvTradeOrderLineStatusLogEntity> implements VvTradeOrderLineStatusLogService {
+
+
+    @Autowired
+	private VvTradeOrderLineStatusLogDao vvTradeOrderLineStatusLogDao;
+
+
+
+	@Override
+	public VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(Long id){
+		return vvTradeOrderLineStatusLogDao.selectVvTradeOrderLineStatusLogById(id);
+	}
+
+
+
+	@Override
+	public Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+		return vvTradeOrderLineStatusLogDao.insertVvTradeOrderLineStatusLog(vvTradeOrderLineStatusLog);
+	}
+
+
+
+	@Override
+	public Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+		return vvTradeOrderLineStatusLogDao.insertOrUpdateVvTradeOrderLineStatusLog(vvTradeOrderLineStatusLog);
+	}
+
+
+
+	@Override
+	public int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+		return vvTradeOrderLineStatusLogDao.updateVvTradeOrderLineStatusLogById(vvTradeOrderLineStatusLog);
+	}
+
+
+
+	@Override
+	public int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+		return vvTradeOrderLineStatusLogDao.updateCoverVvTradeOrderLineStatusLogById(vvTradeOrderLineStatusLog);
+	}
+
+
+
+	@Override
+	public int deleteVvTradeOrderLineStatusLogById(Long id){
+		return vvTradeOrderLineStatusLogDao.deleteVvTradeOrderLineStatusLogById(id);
+	}
+
+
+
+}

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

@@ -0,0 +1,34 @@
+package com.heyu.api.data.service.vv;
+/**
+* <p>
+* 订单表状态变更记录 服务类
+* </p>
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+public interface VvTradeOrderLineStatusLogService extends IService<VvTradeOrderLineStatusLogEntity> {
+
+
+
+	VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(Long id);
+
+
+	Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+	int deleteVvTradeOrderLineStatusLogById(Long id);
+
+
+}

api-mapper/src/main/resources/mapper/vv/VvTradeOrderLineStatusLogDao.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao">
+
+</mapper>
+

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

@@ -94,7 +94,7 @@ public class MysqlMain_insert {
 
         List<TablesBean> list = new ArrayList<TablesBean>();
 
-        list.add(new TablesBean("vv_my_account"));
+        list.add(new TablesBean("vv_trade_order_line_status_log"));
 
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();

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

@@ -49,7 +49,7 @@ 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_line_status_log"));
 
         //list.add(new TablesBean("vv_trade_order"));
 

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

@@ -6,12 +6,18 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class VvUnPackDTO extends AdminBaseDTO{
+public class VvUnShippingDTO extends AdminBaseDTO{
     /***
      * 子订单号 ，是否必填写 ： 是
      */
     private List<Long> tradeOrderLineIds;
 
+
+    /***
+     * 原因
+     */
+    private String reason;
+
 }
 
 

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

@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class VvToPackDTO extends AdminBaseDTO {
+public class VvToShippingDTO extends AdminBaseDTO {
 
     /***
      * 子订单号 ，是否必填写 ： 是
@@ -35,7 +35,7 @@ public class VvToPackDTO extends AdminBaseDTO {
 
     public static void main(String[] args) {
 
-        VvToPackDTO vvToPackDTO = new VvToPackDTO();
+        VvToShippingDTO vvToPackDTO = new VvToShippingDTO();
         List<Long> tradeOrderLineIds = new ArrayList<>();
         tradeOrderLineIds.add(202511172478L);
 

api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java

@@ -8,6 +8,18 @@ import java.util.List;
 
 public interface VvTradeOrderConvertService {
     List<VVOrderListResp> convertTradeOrderLineResp(List<VvTradeOrderEntity> vvTradeOrderEntities,
-                                                    List<VvTradeOrderLineEntity> list,boolean isApp) ;
+                                                    List<VvTradeOrderLineEntity> list, boolean isApp);
+
+
+    public int addOrderLineStatusLogList(List<Long> tradeOrderLineId, String status, String changeStatusUser, String... reason);
+
+
+    int addOrderLineStatusLog(Long tradeOrderLineId,
+                              String status,
+                              String changeStatusUser,
+                              String... reason
+
+    );
+
 
 }

api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java

@@ -4,10 +4,13 @@ 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;
 import com.heyu.api.data.entity.vv.VvPackageEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
 import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
 import com.heyu.api.data.utils.SanUtils;
 import com.heyu.api.service.VvTradeOrderConvertService;
 import org.springframework.beans.BeanUtils;
@@ -25,6 +28,12 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
     private VvPackageDao vvPackageDao;
 
 
+
+    @Autowired
+    private VvTradeOrderLineStatusLogDao vvTradeOrderLineStatusLogDao;
+
+
+
     @Override
     public List<VVOrderListResp> convertTradeOrderLineResp(List<VvTradeOrderEntity> vvTradeOrderEntities,
                                                            List<VvTradeOrderLineEntity> list,boolean isApp) {
@@ -76,4 +85,29 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
         return vvOrderListResps;
     }
 
+    @Override
+    public int addOrderLineStatusLogList(List<Long> tradeOrderLineIdList, String status, String changeStatusUser, String... reason) {
+        for (Long tradeOrderLineId : tradeOrderLineIdList) {
+            addOrderLineStatusLog(tradeOrderLineId, status, changeStatusUser, reason);
+        }
+
+        return tradeOrderLineIdList.size();
+    }
+
+
+    @Override
+    public int addOrderLineStatusLog(Long tradeOrderLineId, String status, String changeStatusUser, String... reason) {
+        VvTradeOrderLineStatusLogEntity entity = new VvTradeOrderLineStatusLogEntity();
+        entity.setTradeOrderLineId(tradeOrderLineId);
+        entity.setStatus(status);
+        entity.setChangeStatusUser(changeStatusUser);
+        if (reason != null && reason.length > 0) {
+            entity.setReason(reason[0]);
+        }
+        entity.setTraceId(LogAspect.threadLocalNo.get());
+        return 1;
+    }
+
+
+
 }

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.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.VvUnPackDTO;
+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.VVOrderDetailResp;
 import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
@@ -42,15 +42,12 @@ import java.util.Map;
 @RequestMapping("/mm/order")
 public class AdminOrderController {
 
-
     @Autowired
     private VvTradeOrderDao vvTradeOrderDao;
 
-
     @Autowired
     private VvTradeOrderLineDao vvTradeOrderLineDao;
 
-
     @Autowired
     private VvPackageDao vvPackageDao;
 
@@ -63,14 +60,9 @@ public class AdminOrderController {
     @Autowired
     private VvTradeOrderLineSettlementProveDao vvTradeOrderLineSettlementProveDao;
 
-
     @Autowired
     private VvTradeOrderConvertService vvTradeOrderConvertService;
 
-
-    @Autowired
-    private VvBuyerAddressDao vvBuyerAddressDao;
-
     @Autowired
     private VvBuyerDao vvBuyerDao;
 
@@ -168,7 +160,6 @@ public class AdminOrderController {
         return R.ok().setData(pageUtils);
     }
 
-
     /***
      * 订单详情
      *
@@ -201,7 +192,7 @@ public class AdminOrderController {
      * http://localhost:8888/mm/order/toShipping
      */
     @RequestMapping("/toShipping")
-    public R toPackAndShipping(@RequestBody VvToPackDTO vvOrderRequest) {
+    public R toPackAndShipping(@RequestBody VvToShippingDTO vvOrderRequest) {
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIds());
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             if (!OrderStatusEnums.wait_shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
@@ -209,28 +200,35 @@ public class AdminOrderController {
             }
         }
         VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId());
-
         VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber());
         if(vvPackageEntity == null ){
             vvPackageEntity = new VvPackageEntity();
         }
-
         if (CollectionUtils.isNotEmpty(vvOrderRequest.getPackageImageUrls())) {
             vvPackageEntity.setPackageImageUrl(JSON.toJSONString(vvOrderRequest.getPackageImageUrls()));
         }
-
         vvPackageEntity.setLogisticsCompany(vvOrderRequest.getLogisticsCompany());
         vvPackageEntity.setShippingAmount(vvOrderRequest.getShippingAmount());
         vvPackageEntity.setShippingFrom(vvOrderRequest.getShippingFrom());
-        vvPackageEntity.setShippingTo(vvTradeOrderEntity.getContry() + vvTradeOrderEntity.getCity() + vvTradeOrderEntity.getDistrict() + vvTradeOrderEntity.getBuyerDetailAddress());
+
+        vvPackageEntity.setShippingTo(vvTradeOrderEntity.getContry()
+                + vvTradeOrderEntity.getCity()
+                + vvTradeOrderEntity.getDistrict()
+                + vvTradeOrderEntity.getBuyerDetailAddress());
+
         vvPackageEntity.setTrackNumber(vvOrderRequest.getTrackNumber());
         vvPackageEntity.setShippingType(ShippingTypeEnums.order.getType());
         vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
+
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setTrackNumber(vvOrderRequest.getTrackNumber());
             tradeOrderLineEntity.setStatus(OrderStatusEnums.shipping.getStatus());              // 已经发货
             tradeOrderLineEntity.setGmtToShipping(new Date());
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                    OrderStatusEnums.shipping.getStatus(),
+                    vvOrderRequest.getUserName());
         }
         return R.ok();
     }
@@ -240,14 +238,22 @@ public class AdminOrderController {
      *  http://localhost:8888/mm/order/unShipping
      */
     @RequestMapping("/unShipping")
-    public R unpack(@RequestBody VvUnPackDTO vvOrderRequest) {
+    public R unpack(@RequestBody VvUnShippingDTO vvOrderRequest) {
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIds());
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setStatus(OrderStatusEnums.wait_shipping.getStatus());
             tradeOrderLineEntity.setTrackNumber(null);
-            tradeOrderLineEntity.setGmtUnpack(new Date());
+            tradeOrderLineEntity.setGmtUnShipping(new Date());
-            tradeOrderLineEntity.setUnpackUser(vvOrderRequest.getUserName());
+            tradeOrderLineEntity.setUnShippingUser(vvOrderRequest.getUserName());
+            tradeOrderLineEntity.setUnShippingReason(vvOrderRequest.getReason());
             vvTradeOrderLineDao.updateCoverVvTradeOrderLineById(tradeOrderLineEntity);
+
+            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                    OrderStatusEnums.wait_shipping.getStatus(),
+                    vvOrderRequest.getUserName(),
+                    vvOrderRequest.getReason()
+            );
+
         }
         return R.ok();
     }
@@ -267,9 +273,15 @@ public class AdminOrderController {
         for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
             tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
             tradeOrderLineEntity.setGmtShipped(new Date());
-            tradeOrderLineEntity.setUnpackUser(vvDeliveredDTO.getUserName());
+            tradeOrderLineEntity.setShippedUser(vvDeliveredDTO.getUserName());
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                    OrderStatusEnums.shipped.getStatus(),
+                    vvDeliveredDTO.getUserName()
+            );
         }
+
         VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvDeliveredDTO.getTrackNumber());
         Date time = new Date();
         Date timeAfter15 = DateUtils.addDays(time, 15);
@@ -314,6 +326,11 @@ public class AdminOrderController {
             tradeOrderLineEntity.setGmtDelivered(new Date());
             tradeOrderLineEntity.setDeliveredUser(vvDeliveredDTO.getUserName());
             vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+            vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+                    OrderStatusEnums.delivered.getStatus(),
+                    vvDeliveredDTO.getUserName()
+            );
         }
         return R.ok();
     }
@@ -331,22 +348,16 @@ public class AdminOrderController {
                 return R.error("订单状态不是wait_shipping，不能取消订单");
             }
         }
-
-        for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
-            vvTradeOrderLineEntity.setGmtCancel(new Date());
-            vvTradeOrderLineEntity.setCancelUser(vvCancelDTO.getUserName());
-            vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
-        }
-
         AppliyReverseRequest appliyReverseRequest = new AppliyReverseRequest();
         appliyReverseRequest.setRefundType(RefundTypeEnums.only_refund.getCode());
         appliyReverseRequest.setRefundReason("订单取消:" + vvCancelDTO.getCancelReason());
         appliyReverseRequest.setStatus(ReverseStatusEnums.cancel.getStatus());
         R r = reverseOrderService.createReverseOrder(vvTradeOrderLineEntityList, appliyReverseRequest);
+
         if (r.ifSuccessful()) {
-            VvReverseOrderEntity reverseOrderEntity = (VvReverseOrderEntity)r.getData();
+            VvReverseOrderEntity reverseOrderEntity = (VvReverseOrderEntity) r.getData();
             Refund refund = jsapiPrepay.refund(reverseOrderEntity.getTradeOrderId(), reverseOrderEntity.getId());
-            log.info("ReverseOrderServiceImpl reverseOrderEntity id:{} refund:{}",reverseOrderEntity.getId(), JSON.toJSONString(refund));
+            log.info("ReverseOrderServiceImpl reverseOrderEntity id:{} refund:{}", reverseOrderEntity.getId(), JSON.toJSONString(refund));
             reverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount()));
             reverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus()));
             reverseOrderEntity.setWeixinRefundId(refund.getRefundId());
@@ -355,7 +366,21 @@ public class AdminOrderController {
             reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount());
             reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund));
             reverseOrderEntity.setGmtPreRefund(new Date());
-            reverseOrderEntity.setGmtCancel(new Date());
+
+            for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
+                vvTradeOrderLineEntity.setGmtCancel(new Date());
+                vvTradeOrderLineEntity.setCancelUser(vvCancelDTO.getUserName());
+                vvTradeOrderLineEntity.setCancelReason(vvCancelDTO.getCancelReason());
+                vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
+
+                vvTradeOrderConvertService.addOrderLineStatusLog(
+                        vvTradeOrderLineEntity.getId(),
+                        OrderStatusEnums.cancel.getStatus(),
+                        vvCancelDTO.getUserName(),
+                        vvCancelDTO.getCancelReason()
+                );
+            }
+
             vvReverseOrderDao.updateVvReverseOrderById(reverseOrderEntity);
         }
         return r;
@@ -388,7 +413,6 @@ public class AdminOrderController {
             vvTradeOrderLineSettlementProveEntity.setSettlementProveId(vvSettlementProveEntity.getId());
             vvTradeOrderLineSettlementProveDao.insertOrUpdateVvTradeOrderLineSettlementProve(vvTradeOrderLineSettlementProveEntity);
         }
-
         return R.ok();
     }