diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java index ea8ccc0..98d8605 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java @@ -62,10 +62,7 @@ public interface VvTradeOrderDao extends BaseMapper { @IF@LE Long maxCreateTimestamp, @IF String createTimestampSort); - - - void updateByBuerIdAndIds(String status,@By Long buyerId,@By List ids); - + Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id); List selectVvTradeOrderByTradeOrderIds(@IFNullReturnEmpty @IN List id); diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java index 1f24879..14280eb 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java @@ -127,6 +127,7 @@ public interface VvTradeOrderLineDao extends BaseMapper List selectByAppCondition(IPage page, @IF @IN List tradeOrderIds, @IF String status, + @IF@NE String deleteStatus, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LIKE String productName, 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 2cf15ef..42ae469 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 @@ -3,16 +3,21 @@ package com.heyu.api.alibaba.request.mm.order.resp; import lombok.Data; -import java.util.List; - @Data public class VvTradeOrderDeleteDTO { - private List ids ; - + /*** + * 物流单号 + */ + private String trackNumber; + /*** + * 买家id + */ private Long buyerId ; + + } 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 d174aeb..03c92cc 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 @@ -32,7 +32,7 @@ public class AppOrderRequest { private Long maxCreateTimestamp; /** - * 按时间排序 + * 按时间排序 ASC , DESC */ private String createTimestampSort; @@ -40,6 +40,8 @@ public class AppOrderRequest { // wait_pay:待支付,待发货:wait_shipping, 已经发货: shipping , 已接收,delivered private String status; + + /*** * 逆向状态 */ 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 2c47ce0..e1345f1 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 @@ -75,6 +75,7 @@ public class AppOrderController { return vvTradeOrderLineDao.selectByAppCondition(page, vvOrderRequest.getTradeOrderIds(), vvOrderRequest.getStatus(), + OrderStatusEnums.delete.getStatus(), vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getProductName(), @@ -84,8 +85,6 @@ public class AppOrderController { ); } }); - - // 获取子单 List vvTradeOrderLineEntities = pageUtils.getRows(); // 获取订单 @@ -261,13 +260,13 @@ public class AppOrderController { @RequestMapping("/delete") public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { - vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvOrderRequest.getIds()); + List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvOrderRequest.getTrackNumber()); + for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) { + vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId()); + } return R.ok(); } - - - /*** * 订单 妥投 /app/order/delivered */