Commit 8de0de615f5fe5bb0617d950fb6e57f650efdcf2

Authored by 卢越
1 parent 96bffc41

【功能优化】售后退货退款时首先返还抵扣积分,然后再扣减赠送积分

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeMemberPointOrderHandler.java
@@ -78,17 +78,15 @@ public class TradeMemberPointOrderHandler implements TradeOrderHandler { @@ -78,17 +78,15 @@ public class TradeMemberPointOrderHandler implements TradeOrderHandler {
78 78
79 @Override 79 @Override
80 public void afterCancelOrderItem(TradeOrderDO order, TradeOrderItemDO orderItem) { 80 public void afterCancelOrderItem(TradeOrderDO order, TradeOrderItemDO orderItem) {
81 - // 扣减(回滚)积分(订单赠送)  
82 - reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM,  
83 - orderItem.getId());  
84 // 增加(回滚)积分(订单抵扣) 81 // 增加(回滚)积分(订单抵扣)
85 - addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM,  
86 - orderItem.getId()); 82 + addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM, orderItem.getId());
  83 +
  84 + // 扣减(回滚)积分(订单赠送)
  85 + reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM, orderItem.getId());
87 86
88 // 扣减(回滚)用户经验 87 // 扣减(回滚)用户经验
89 AfterSaleDO afterSale = afterSaleService.getAfterSale(orderItem.getAfterSaleId()); 88 AfterSaleDO afterSale = afterSaleService.getAfterSale(orderItem.getAfterSaleId());
90 - memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(),  
91 - MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId())); 89 + memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(), MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId()));
92 } 90 }
93 91
94 /** 92 /**