Ver código fonte

fix 优惠卷退款

zoujiajian 3 anos atrás
pai
commit
0e9fbe567f

+ 8 - 10
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1095,16 +1095,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	private void updateOrderDonCouponStatus(OrderDon orderDon) {
 		log.info("订单:{}退款,优惠券返还start...", orderDon.getId());
 		CouponUser couponUser = couponUserMapper.selectById(orderDon.getCouponUserId());
-		if (CouponUser.Channel.exCode == couponUser.getChannel()) {
-			//兑换码兑换的优惠券退款时,直接删除
-			couponUserMapper.deleteById(couponUser.getId());
-		}else {
-			CouponUserView couponUserView = beanSearcher.searchFirst(CouponUserView.class, MapUtils.builder().field(CouponUserView::getCouponId, couponUser.getCouponId()).build());
-			couponUserView.setCouponUserStatus(CouponUser.Status.unused);
-			couponFontService.setCouponUserStatus(couponUserView, DateTime.now());
-			couponUser.setStatus(couponUserView.getCouponUserStatus());
-			couponUserMapper.updateById(couponUser);
-		}
+		CouponUserView couponUserView = beanSearcher.searchFirst(CouponUserView.class, MapUtils.builder()
+				.field(CouponUserView::getCouponId, couponUser.getCouponId()).op(Operator.Equal)
+				.field(CouponUserView::getUserId, orderDon.getUserId()).op(Operator.Equal)
+				.build());
+		couponUserView.setCouponUserStatus(CouponUser.Status.unused);
+		couponFontService.setCouponUserStatus(couponUserView, DateTime.now());
+		couponUser.setStatus(couponUserView.getCouponUserStatus());
+		couponUserMapper.updateById(couponUser);
 		log.info("订单:{}退款,优惠券返还end...", orderDon.getId());
 	}