Selaa lähdekoodia

feature: 自助报到
1.自助报到安排房间

luo.yibo@datuai.com 1 vuosi sitten
vanhempi
commit
a28c720df6

+ 2 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -301,7 +301,6 @@ public class TraineeBusiness {
         Long teamId = bo.getTeamId();
         String key = CacheNames.CLASS_ROOM + "_" + teamId;
         log.info("[团队Id]-[{}],[redisKey]-{}",teamId,key);
-        log.info("[redis]-{}",RedisUtils.getCacheObject(key).toString());
         if (RedisUtils.getCacheObject(key) != null) {
             LinkedBlockingQueue<String> concurrentLinkedQueue = RedisUtils.getCacheObject(key);
             String roomCode = concurrentLinkedQueue.poll();
@@ -312,6 +311,8 @@ public class TraineeBusiness {
             } else {
                 RedisUtils.deleteObject(key);
             }
+        } else {
+            log.info("[redis获取缓存失败]-[key:{}]",key);
         }
     }
 

+ 6 - 8
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/ThirdPayController.java

@@ -1,27 +1,23 @@
 package org.dromara.backstage.payment.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.backstage.business.payments.ThirdPayBusiness;
-import org.dromara.backstage.consumption.domain.bo.XfCreditAccountBackBo;
-import org.dromara.backstage.consumption.domain.vo.XfCreditAccountBackVo;
 import org.dromara.backstage.payment.domain.bo.PayOrderBo;
 import org.dromara.backstage.payment.domain.vo.PayOrderVo;
 import org.dromara.common.core.api.ResponseResult;
 import org.dromara.common.core.api.ReturnResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.enums.CreditStatusEnum;
 import org.dromara.common.core.enums.PayStatusEnum;
 import org.dromara.common.core.enums.ResultCodeEnum;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * name: ThirdPayController
@@ -55,6 +51,7 @@ public class ThirdPayController extends BaseController {
 
         return thirdPayBusiness.payCallBackHandler(bo);
     }
+
     @RequestMapping("/back/{orderSn}/{paySn}")
     public R<PayOrderVo> callBackThirdPay(@PathVariable("orderSn") String orderSn, @PathVariable("paySn") String paySn){
         PayOrderBo bo = new PayOrderBo();
@@ -65,6 +62,7 @@ public class ThirdPayController extends BaseController {
 
         return thirdPayBusiness.payCallBackHandler(bo);
     }
+
     /**
      * 查询充值订单支付状态
      * @param orderSn 充值订单