fix:IOS风控bugFix

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

@@ -29,6 +29,7 @@ import com.ytpm.risk.view.RiskConfigView;
 import com.ytpm.risk.view.RiskTemplateView;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -172,8 +173,9 @@ public class UserController {
     }
 
     @PostMapping("/adRecords/page")
-    public ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param) {
+    public ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param, Errors errors) {
         PageHelper.startPage(param.getPage(), param.getLimit());
+        log.error("=================================",param.getLoginStatus());
         List<YtDyzAdRecord> adrecords = adRecordMapper.getByUserByParam(param);
         return ResultTable.resultTableOk(new PageInfo<>(adrecords));
     }

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

@@ -7,6 +7,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.ytpm.agent.model.YtDitch;
 import com.ytpm.app.enums.AppTypeEnums;
+import com.ytpm.app.enums.LoginType;
 import com.ytpm.app.model.YtAppDefaultConfig;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzPowerRecord;
@@ -116,7 +117,6 @@ 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);
@@ -139,11 +139,12 @@ public class WxController {
         YtDyzUser user = appUserMapper.selectByIosId(param.getIosId());
         if (user == null) {
             IosUserInfo userInfo = setIosUserInfo(param);
-            YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo);
-            return Result.resultObjOk(old);
+            user = appUserService.crudForNewTransIos(param, userInfo);
         }
         List<YtDyzAdRecord> adRecordList = recordMapper.getByIosId(param.getIosId());
         user.setPreAdRecordList(adRecordList);
+        user.setLoginType(LoginType.VISITOR);
+        riskFeign.checkLoginRisk(user);
         return Result.resultObjOk(user);
     }
 

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/service/impl/AppUserServiceImpl.java

@@ -300,11 +300,14 @@ public class AppUserServiceImpl implements AppUserService {
         old.setWithdrawTotal(BigDecimal.ZERO);
         old.setDitchId(param.getDitchId());
         old.setSignDays(0);
-        YtDitch ditch = ditchMapper.selectById(param.getDitchId());
-        if (ditch != null) {
-            old.setAppId(ditch.getAppId());
+        YtDitch ditch;
+        if (param.getDitchId() == null){
+            old.setDitchId(2025062500193L);
+            old.setAppId("251be4dff0fd408fbc1fe2c47bf515eb");
         } else {
-            old.setAppId("");
+            ditch = ditchMapper.selectById(param.getDitchId());
+            old.setDitchId(param.getDitchId());
+            old.setAppId(ditch.getAppId());
         }
         old.setUserStatus(UserStatusEnum.NORMAL.getCode());
         old.setIosId(param.getIosId());

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

@@ -1072,8 +1072,16 @@ public class RiskServiceImpl implements RiskService {
      * @param dyzUser 该设备同应用的最新一条注册用户信息
      */
     private boolean checkVisitorRisk(YtDyzUser dyzUser) {
-        RiskTemplateView view = configMapper.getByCode(dyzUser.getAppId() + "-344");
-        RiskTemplateView view2 = configMapper.getByCode(dyzUser.getAppId() + "-345");
+        RiskTemplateView view;
+        RiskTemplateView view2;
+        if (dyzUser.getIosId() != null){
+            view = configMapper.getByCode("a689ab630d3e62" + "-344");
+            view2 = configMapper.getByCode("a689ab630d3e62" + "-345");
+        } else {
+            view = configMapper.getByCode(dyzUser.getAppId() + "-344");
+            view2 = configMapper.getByCode(dyzUser.getAppId() + "-345");
+        }
+
         boolean checkResult = true;
         if((view != null && view.getEnabled() == 1) || (view2 != null && view2.getEnabled() == 1)) {
             //根据用户所属应用查询该应用母包openid查询用户信息