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 32e3fa5..653f753 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 @@ -85,7 +85,8 @@ public interface VvTradeOrderLineDao extends BaseMapper @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LIKE String productName, - @IF Long productId, + @IF Integer refundCount, + @IF Long productId, @IF Long sellerId, @IF @LIKE String sellerName, @IF Long buyerId, diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java index 7df0080..0ec3e70 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java @@ -32,6 +32,11 @@ public enum OrderStatusEnums { refund("refund","退款"), delete("delete","删除"), + + + + + ; diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java index c40c0d6..b29704a 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/ReverseOrderServiceImpl.java @@ -111,6 +111,7 @@ public class ReverseOrderServiceImpl implements ReverseOrderService { // 设置退款相关的东西 vvTradeOrderLineEntity.setRefundCount(1); vvTradeOrderLineEntity.setRefundAmount(vvReverseOrderLineEntity.getRefundAmount()); + // 更新子单的逆向状态 vvTradeOrderLineEntity.setReverseStatus(appliyReverseRequest.getStatus()); vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java index b8d50c5..2c61f26 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVOrderRequest.java @@ -78,6 +78,10 @@ public class VVOrderRequest extends AdminBaseDTO { * 买家id */ private Long buyerId; + /*** + * 如果状态是refund ，则refundCount = 1 + */ + private Integer refundCount; /** * @@ -92,6 +96,10 @@ public class VVOrderRequest extends AdminBaseDTO { private String modifyTimestampSort; + + + + } 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 c0a1ac2..b2fa21e 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 @@ -106,6 +106,9 @@ public class AdminOrderController { @Describe("后台订单列表") @RequestMapping("/list") public R list(@RequestBody VVOrderRequest vvOrderRequest) { + if(OrderStatusEnums.refund.equals(vvOrderRequest.getStatus())){ + vvOrderRequest.setRefundCount(1); + } PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize()) .doSelect(new ISelect() { @@ -123,6 +126,7 @@ public class AdminOrderController { vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getProductName(), + vvOrderRequest.getRefundCount(), vvOrderRequest.getProductId(), vvOrderRequest.getSellerId(), vvOrderRequest.getSellerName(), 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 f28a872..6265a40 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 @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -64,7 +65,6 @@ public class AppReverseController { private VvSellerWarehouseDao vvSellerWarehouseDao; - /*** * * https://api.1024api.com/api-interface/app/reverse/add @@ -87,11 +87,11 @@ public class AppReverseController { if (r.ifSuccessful()) { VvReverseOrderEntity vvReverseOrderEntity = (VvReverseOrderEntity) r.getData(); vvReverseOrderEntity.setGmtBuyerApplyRefund(new Date()); - vvReverseOrderDao.updateVvReverseOrderById(vvReverseOrderEntity); } return R.ok(); } + /** * 退货退款 ： /app/reverse/tracknumber * @@ -100,7 +100,7 @@ public class AppReverseController { @RequestMapping("/upload/tracknumber") public R uploadTracknumber(@RequestBody AppliyReverseProveRequest appliyReverseRequest) { VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId()); - if ( AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, + if (AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, ActionEnums.App_Buyer_Upload_Reverse_TrackNumber.getButtonName())) { return R.error("逆向订单状态非seller_agree_return_wait_buyer_post，不对"); } @@ -153,20 +153,17 @@ public class AppReverseController { return R.ok(); } - /** * 逆向订单关闭 ： /app/reverse/close - * */ @Describe("逆向订单关闭") @RequestMapping("/close") public R close(@RequestBody AppliyReverseCloseRequest request) { VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(request.getReverseOrderId()); - if ( AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, + if (AbstractReverseAction.checkFailed(vvReverseOrderEntity, false, ActionEnums.App_Buyer_Reverse_Order_Close.getButtonName())) { return R.error("逆向订单状态不允许关闭 "); } - vvReverseOrderEntity.setStatus(ReverseStatusEnums.close.getStatus()); vvReverseOrderEntity.setGmtClose(new Date()); vvReverseOrderEntity.setCloseReason(request.getReason()); @@ -177,11 +174,15 @@ public class AppReverseController { List tradeOrderLineEntities = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(tradeOrderLineIds); for (VvTradeOrderLineEntity tradeOrderLineEntity : tradeOrderLineEntities) { tradeOrderLineEntity.setReverseStatus(ReverseStatusEnums.close.getStatus()); + + // 设置退款数量为0 + tradeOrderLineEntity.setRefundCount(0); + tradeOrderLineEntity.setRefundAmount(BigDecimal.ZERO); vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity); vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(), ReverseStatusEnums.close.getStatus(), - request.getBuyerId() , + request.getBuyerId(), request.getBuyerName() ); }