退回优惠券

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -1189,11 +1189,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         userOrder.setUpdateTime(new Date());
         baseMapper.updateById(userOrder);
 
-        // 重置优惠券状态
-        couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder()
-                        .orderNo(userOrder.getOrderNo())
-                        .reset(true)
-                .build());
     }
 
     /**
@@ -1204,6 +1199,14 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void payCancel(UserOrderVo userOrder) {
+
+
+        // 重置优惠券状态
+        couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder()
+                .orderNo(userOrder.getOrderNo())
+                .reset(true)
+                .build());
+
         List<UserOrderDetailVo> orderDetailList = orderDetailService.getOrderDetilListByOrderNo(userOrder.getOrderNo());
         for (UserOrderDetailVo orderDetailVo : orderDetailList) {
             orderDetailVo.setUserId(userOrder.getUserId());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -475,20 +475,9 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                     throw new BizException("查询交易中，请耐心等待!");
                 }
 
-                order.status(EPaymentStatus.CLOSED).setErrorMsg(errorMessage);
-
-                // 更新订单关闭状态
-                userPaymentOrderService.updateById(order);
-
-
-                // 重置优惠券状态
-                couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder()
-                        .orderNo(paymentOrder.getOrderNo())
-                        .reset(true)
-                        .build());
-
-                // 订单关闭后的数据处理流程
-                userOrderService.payCancel(userOrderService.detail(order.getId()));
+                // 更新订单状态为已关闭
+                paymentOrder.setErrorMsg(errorMessage);
+                closeWaitOrder(paymentOrder);
 
             }
 
@@ -1265,15 +1254,10 @@ DISCOUNT("畅学卡")
             .id(paymentOrder.getId())
             .status(EPaymentStatus.CLOSED)
             .updateTime(DateTime.now().toDate())
+            .errorMsg(paymentOrder.getErrorMsg())
             .build();
         userPaymentOrderService.updateById(order);
 
-
-        // 重置优惠券状态
-        couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder()
-                .orderNo(paymentOrder.getOrderNo())
-                .reset(true)
-                .build());
         // 订单关闭后的数据处理流程
         userOrderService.payCancel(userOrderService.detail(order.getId()));