Merge remote-tracking branch 'origin/master' into lih

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/WxController.java

@@ -116,6 +116,7 @@ public class WxController {
         IosUserInfo userInfo = setIosUserInfo(param);
         param.setLoginIp(getClientIp(request));
         YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo);
+        riskFeign.checkLoginRisk(old);
         //调用风控服务校验默认风控配置
         old.setRiskCode("313");
         Result<?> result = riskFeign.checkRisk(old);
@@ -143,7 +144,7 @@ public class WxController {
         }
         List<YtDyzAdRecord> adRecordList = recordMapper.getByIosId(param.getIosId());
         user.setPreAdRecordList(adRecordList);
-        return riskFeign.checkLoginRisk(user);
+        return Result.resultObjOk(user);
     }
 
     @PostMapping("/getByDitchId")

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -1003,8 +1003,12 @@ public class RiskServiceImpl implements RiskService {
 //        // 游客登陆风控校验
 //        RiskTemplateView view = configMapper.getByCode(dyzUser.getAppId() + "-323");
 //        checkVisitor323(dyzUser, view);
+        //查询当前用户今日有被解封则直接放行
+        List<RiskDeblockingListView> vo = riskManageMapper.queryTodayDeblock(dyzUser.getUserId());
+        if(CollUtil.isNotEmpty(vo)){
+            return Result.resultOk(RepMessage.QUERY_SUCCESS);
+        }
         // 游客用户总收益校验
-
         if(dyzUser.getLoginType() != null && LoginType.VISITOR == dyzUser.getLoginType()){
             boolean checkResult = checkVisitorRisk(dyzUser);
             if (!checkResult) {