diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java index 9501c08..2e462d5 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java +++ b/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 + "}"; } } \ No newline at end of file diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AdminPackageDTO.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AdminPackageDTO.java similarity index 90% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AdminPackageDTO.java rename to api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AdminPackageDTO.java index 9a3b2a7..54076a3 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AdminPackageDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppPackageDTO.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AppPackageDTO.java similarity index 65% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppPackageDTO.java rename to api-mapper/src/main/java/com/heyu/api/data/kuaidi100/AppPackageDTO.java index 271bc1d..67dc8da 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppPackageDTO.java +++ b/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 vvTradeOrderLineDOList = new ArrayList<>(); - + /*** + * 操作信息 + */ private List orderActionList; + /*** + * 订单信息 + */ private VvTradeOrderEntity tradeOrderEntity; + /*** + * 包裹信息 + */ + private VvPackageEntity vvPackageEntity; + } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/OrderActionDTO.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/OrderActionDTO.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/OrderActionDTO.java rename to api-mapper/src/main/java/com/heyu/api/data/kuaidi100/OrderActionDTO.java index 9fd5c65..e48debd 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/OrderActionDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderListResp.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VVOrderListResp.java similarity index 83% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderListResp.java rename to api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VVOrderListResp.java index c187319..cd92c31 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderListResp.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderLineDO.java b/api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VvTradeOrderLineDO.java similarity index 75% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderLineDO.java rename to api-mapper/src/main/java/com/heyu/api/data/kuaidi100/VvTradeOrderLineDO.java index c7212f5..462f888 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderLineDO.java +++ b/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 mergeIdList ; + + + + } diff --git a/api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java similarity index 93% rename from api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractOrderAction.java index 767a7d9..f91ede2 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractReverseAction.java similarity index 94% rename from api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/AbstractReverseAction.java index 2373913..52ea68a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBaseRequest.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java similarity index 89% rename from api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBaseRequest.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/AppBaseRequest.java index 377b131..d6afb36 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBaseRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/AppliyReverseRequest.java similarity index 82% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/AppliyReverseRequest.java index 39b81e3..a828c80 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/ResourceDTO.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/ResourceDTO.java similarity index 80% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/ResourceDTO.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/ResourceDTO.java index 3b7d4c7..4ebe1ed 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/ResourceDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/service/ReverseOrderService.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderService.java similarity index 74% rename from api-third/src/main/java/com/heyu/api/service/ReverseOrderService.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderService.java index 9eace59..14ac327 100644 --- a/api-third/src/main/java/com/heyu/api/service/ReverseOrderService.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/service/impl/ReverseOrderServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java similarity index 96% rename from api-third/src/main/java/com/heyu/api/service/impl/ReverseOrderServiceImpl.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java index fab11b0..49c1fef 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/ReverseOrderServiceImpl.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyRefund.java similarity index 84% rename from api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyRefund.java index 0a8cc47..332a5ab 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java +++ b/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 { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyReturnRefund.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ApplyReturnRefund.java index bb35d72..041bd41 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java +++ b/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 { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/BuyerCloseReverseOrderAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/order/BuyerCloseReverseOrderAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerCloseReverseOrderAction.java index 2d0867f..7f2f3e7 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/BuyerCloseReverseOrderAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/BuyerUploadReverseTrackNumberAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerUploadReverseTrackNumberAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/order/BuyerUploadReverseTrackNumberAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/BuyerUploadReverseTrackNumberAction.java index a9335db..7c3dafb 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/BuyerUploadReverseTrackNumberAction.java +++ b/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 { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CancelAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CancelAction.java index f785757..15da1f5 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CloseAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/CloseAction.java index 207b20d..d82bb7a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeleteAction.java similarity index 90% rename from api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeleteAction.java index b0d8db9..d1a4a31 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeliveredAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/DeliveredAction.java index f56c3d9..c1da070 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ShippedAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ShippedAction.java index 05b874a..0d30164 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ToShippingAction.java similarity index 84% rename from api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/ToShippingAction.java index 48547c2..c66010f 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/order/UnShippingAction.java similarity index 84% rename from api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/order/UnShippingAction.java index 78f695a..d2d035e 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeCancelAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeCancelAction.java index 2a93260..717a1ea 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java +++ b/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; /*** * 卖家同意取消 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeRefundAction.java similarity index 87% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeRefundAction.java index b8a78ff..952d35e 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java +++ b/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; /*** * 卖家同意取消 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeReturnRefundAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeReturnRefundAction.java index 920fafe..4f234a3 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java +++ b/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; /*** * 卖家同意取消 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeSignReceiptAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerAgreeSignReceiptAction.java index 2bf1e78..9ce7bb3 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerQaCheckFinishedAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerQaCheckFinishedAction.java index 166eede..2179810 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectCancelAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectCancelAction.java index d2d7ae4..810a24c 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java +++ b/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; /*** diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectRefundAction.java similarity index 88% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectRefundAction.java index a965147..cac0af6 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java +++ b/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; /*** * 卖家同意取消 diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectReturnRefundAction.java similarity index 86% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectReturnRefundAction.java index df6f343..d65a242 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java +++ b/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; /*** * diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectSignReceiptAction.java similarity index 85% rename from api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/reverse/SellerRejectSignReceiptAction.java index 1a4813d..2e6dfa1 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java +++ b/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 diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java index 019c90e..80e1afb 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java +++ b/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 vvReverseOrderLineEntities = vvReverseOrderLineDao.selectVvReverseOrderLineByReverseOrderId(vvReverseOrderEntity.getId()); + + List tradeOrderLineIdList = SanUtils.getFieldList(vvReverseOrderLineEntities,VvReverseOrderLineEntity::getTradeOrderLineId ); + + if(CollectionUtils.isNotEmpty(tradeOrderLineIdList)){ + List 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() + ); + } + } } } } diff --git a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java similarity index 78% rename from api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java rename to api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java index f4b775e..4df150a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java +++ b/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 buildAppPackageDTO(List vvOrderListResps) { + List 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; + } + } diff --git a/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java similarity index 76% rename from api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java rename to api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderConvertService.java index 83718c5..9807657 100644 --- a/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java +++ b/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 buildAppPackageDTO(List vvOrderListResps); } diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 4597df9..b95ef82 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -49,9 +49,9 @@ public class MysqlMain_update { List list = new ArrayList(); - 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 map = MysqlUtil2ShowCreateTable.getComments(); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java index 911886e..d262ac1 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java index 10046ac..9cd587a 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java index 994d1c5..0988121 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java index 5c18984..dc9ff02 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppCloseDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppCloseDTO.java index 223711d..1b1b23f 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppCloseDTO.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java index 49205a9..7b06a18 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvSettleProveDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvSettleProveDTO.java index 192a8c8..a016702 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvSettleProveDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java index 6599bea..900c8d4 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java +++ b/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 tradeOrderLineIds = new ArrayList<>(); - tradeOrderLineIds.add(202511172478L); + tradeOrderLineIds.add(202511172477L); List 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)); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderDetailDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderDetailDTO.java new file mode 100644 index 0000000..8b1f405 --- /dev/null +++ b/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 tradeOrderLineIdList; + + + + + +} diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java index b033431..30ee6e3 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java index 356a4a0..4571007 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderCancelDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderCancelDTO.java index ef21754..4fc7547 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderCancelDTO.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java index d974e42..d02f150 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java index f7f3b9e..067273c 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderShippedDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderShippedDTO.java index 5ac609f..f860ef4 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderShippedDTO.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java index 42113e9..34ff770 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java index 1674350..ed08fe7 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java +++ b/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.alibaba.request.vv.AppBaseRequest; +import com.heyu.api.data.service.impl.ResourceDTO; +import com.heyu.api.data.service.impl.AppBaseRequest; import lombok.Data; import java.util.List; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java index 8482101..62dd629 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvApproveRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvReverseOrderDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvReverseOrderDTO.java index 4fda6e1..d10f8c2 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/VvReverseOrderDTO.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java index 6e94ddf..5a862bc 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java index c87d421..b238d6f 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java index 51e1c7a..7411b84 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java index f7d009d..47e3f56 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java index 0dbdfa1..c048938 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java index 3cd5334..4108a56 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java index 4e570f7..f9b8277 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppLinkRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppLinkRequest.java index 1ba6269..73847b9 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppLinkRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java index 94943ae..7e72202 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java index 3f7da58..6726652 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java index d72560c..ba295e8 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppQrCodeRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppQrCodeRequest.java index 38396ea..d5d4a79 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppQrCodeRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppSchemeRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppSchemeRequest.java index 802aa4b..f2af7ec 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppSchemeRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java index a46cac5..4d869d9 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java +++ b/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; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java index 054d601..d463ca6 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java index 02f215e..b986f85 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java +++ b/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 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShortLinkRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShortLinkRequest.java index eacded0..e973170 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShortLinkRequest.java +++ b/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 diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index c68649a..fd1646f 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/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.alibaba.request.mm.order.resp.VvTradeOrderLineDO; -import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest; +import com.heyu.api.data.kuaidi100.VVOrderListResp; +import com.heyu.api.data.kuaidi100.VvTradeOrderLineDO; +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.service.VvTradeOrderConvertService; -import com.heyu.api.service.impl.AbstractOrderAction; +import com.heyu.api.data.service.impl.ReverseOrderService; +import com.heyu.api.data.service.vv.VvTradeOrderConvertService; +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; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java index 5a03bc6..26e76bb 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminReverseController.java +++ b/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.service.impl.AbstractReverseAction; +import com.heyu.api.data.service.vv.VvTradeOrderConvertService; +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; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index d781ea3..32b1258 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/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 vvTradeOrderLineEntities = vvTradeOrderLineDao.selectAppTradeOrderByTradeOrderIds(tradeOrderIds); List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, vvTradeOrderLineEntities, true); - List 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); + List appPackageDTOList = vvTradeOrderConvertService.buildAppPackageDTO(vvOrderListResps); - appPackageDTOList.add(appPackageDTO); - } + return R.ok().setData(appPackageDTOList); + } + + + /*** + * 订单添加 + * + * http://localhost:8888/app/order/detail + */ + @Describe("订单详情") + @RequestMapping("/detail") + public R detail(@RequestBody AppTradeOrderDetailDTO vvOrderRequest) { + List vvTradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIdList()); + List trackNumbers = SanUtils.field2Set2List(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTrackNumber); + if (CollectionUtils.isNotEmpty(trackNumbers)) { + for (String trackNumber : trackNumbers) { + vvPackageService.selectVvKuaidiAndUpdateData(trackNumber, RoleEnums.user.getRole()); } } + + List tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId); + // 拿到订单的顺序 + List tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds); + List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(tradeOrderEntities, vvTradeOrderLineEntities, true); + List appPackageDTOList = vvTradeOrderConvertService.buildAppPackageDTO(vvOrderListResps); return R.ok().setData(appPackageDTOList); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java index f14db0a..8593477 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java +++ b/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.service.VvTradeOrderConvertService; +import com.heyu.api.data.service.impl.ReverseOrderService; +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; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppScrollController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppScrollController.java index 1c7bfd2..1011ef1 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppScrollController.java +++ b/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; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java b/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java index d39c6f3..86edf3f 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/schedule/impl/PackageUpdateJob.java +++ b/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 vvPackageEntityList = vvPackageDao.selectVvPackageByIsCheckNotIN(Arrays.asList("2", "3")); for (VvPackageEntity vvPackageEntity : vvPackageEntityList) { - vvPackageService.selectVvKuaidiAndUpdateData(vvPackageEntity.getTrackNumber(), RoleEnums.job.getRole()); } - - } } diff --git a/api-web/api-interface/src/test/java/com/api/test/Test4.java b/api-web/api-interface/src/test/java/com/api/test/Test4.java index c07bdc8..dee4cc6 100644 --- a/api-web/api-interface/src/test/java/com/api/test/Test4.java +++ b/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;