枚举

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -29,6 +29,7 @@
     <sql id="baseColumns">
          t.id_ as id
         , t.order_no_ as orderNo
+         ,t.payment_version_ as paymentVersion
         , t.user_id_ as userId
         , t.recom_user_id_ as recomUserId
         , t.activity_id_ as activityId

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -147,7 +147,7 @@ public class UserOrderController extends BaseController {
     })
     public HttpResponseResult<UserOrderVo> getPendingOrder(@ApiIgnore @RequestBody OrderSearch query) {
         if (null == query.getGoodType()
-                || (!GoodTypeEnum.VIP.equals(query.getGoodType()) && null == query.getBizId())) {
+                || (!GoodTypeEnum.VIP.getCode().equals(query.getGoodType()) && null == query.getBizId())) {
             return HttpResponseResult.failed("参数异常");
         }
         SysUser user = sysUserFeignService.queryUserInfo();
@@ -183,23 +183,25 @@ public class UserOrderController extends BaseController {
 
             // 用户取消支付
             userPaymentCoreService.cancelPayment(JwtUserInfo.builder().userId(user.getId().toString()).clientType(ClientEnum.STUDENT.getCode()).build(), payReq.getOrderNo());
-        }
-
-        try {
-            HttpResponseResult<Boolean> res = DistributedLock.of(redissonClient)
-                    .runIfLockToFunction(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey(payReq.getOrderNo())
-                            , userOrderService::orderCancel, payReq, 10L);
-            if (null != res) {
-                return res;
-            } else {
+        } else {
+
+            try {
+                HttpResponseResult<Boolean> res = DistributedLock.of(redissonClient)
+                        .runIfLockToFunction(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey(payReq.getOrderNo())
+                                , userOrderService::orderCancel, payReq, 10L);
+                if (null != res) {
+                    return res;
+                } else {
+                    return HttpResponseResult.failed("取消订单失败");
+                }
+            } catch (BizException e) {
+                return HttpResponseResult.failed(e.getMessage());
+            } catch (Exception e) {
+                e.printStackTrace();
                 return HttpResponseResult.failed("取消订单失败");
             }
-        } catch (BizException e) {
-            return HttpResponseResult.failed(e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return HttpResponseResult.failed("取消订单失败");
         }
+        return succeed();
     }
 
     /**