refund bugfix;

share-quartz/src/main/java/share/quartz/task/OrderTask.java

@@ -215,8 +215,10 @@ public class OrderTask {
                 // 退优惠券
                 if (ObjectUtil.isNotNull(sOrder.getCouponId())) {
                     SConsumerCoupon couponUser = consumerCouponService.getById(sOrder.getCouponId());
-                    couponUser.setUseStatus(CouponStatusEnum.NORMAL.getValue());
-                    consumerCouponService.updateById(couponUser);
+                    if(Objects.nonNull(couponUser)) {
+                        couponUser.setUseStatus(CouponStatusEnum.NORMAL.getValue());
+                        consumerCouponService.updateById(couponUser);
+                    }
                 }
                 return true;
             });

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -813,28 +813,29 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 e.printStackTrace();
                 throw new BaseException("微信申请退款失败！");
             }
+        }else {
+            //修改订单退款状态,退款成功
+            sOrder.setStatus(OrderStatusEnum.CANCEL.getCode());
+            sOrder.setRefundStatus(RefundStatusEnum.REFUNDED.getCode());
+            sOrder.setRefundReasonTime(cn.hutool.core.date.DateUtil.date());
+            sOrder.setRefundPrice(BigDecimal.ZERO);
+            Boolean execute = Boolean.FALSE;
+            try {
+                sOrder.setRefundReason(request.getRefundReason());
+                updateById(sOrder);
+                //微信退款
+//                if (sOrder.getPayType().equals(PayTypeEnum.WECHAT.getCode()) && request.getAmount().compareTo(BigDecimal.ZERO) == 0) {
+                    // 退款task， 定时任务退优惠券
+                    redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, sOrder.getId());
+//                }
+                execute = Boolean.TRUE;
+            } catch (Exception e) {
+                logger.error(e.toString());
+            }
+            if (!execute) {
+                throw new BaseException("订单更新失败");
+            }
         }
-        //修改订单退款状态,退款成功
-//        sOrder.setStatus(OrderStatusEnum.CANCEL.getCode());
-//        sOrder.setRefundStatus(RefundStatusEnum.REFUNDED.getCode());
-//        sOrder.setRefundReasonTime(cn.hutool.core.date.DateUtil.date());
-//        sOrder.setRefundPrice(request.getAmount());
-//        Boolean execute = Boolean.FALSE;
-//        try {
-//            sOrder.setRefundReason(request.getRefundReason());
-//            updateById(sOrder);
-//            //微信退款
-//            if (sOrder.getPayType().equals(PayTypeEnum.WECHAT.getCode()) && request.getAmount().compareTo(BigDecimal.ZERO) == 0) {
-//                // 退款task， 定时任务退优惠券
-//                redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, sOrder.getId());
-//            }
-//            execute = Boolean.TRUE;
-//        } catch (Exception e) {
-//            logger.error(e.toString());
-//        }
-//        if (!execute) {
-//            throw new BaseException("订单更新失败");
-//        }
         return Boolean.TRUE;
     }