fix:ios新增掺量渠道数据

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/feign/warehouseIosFeign.java

@@ -0,0 +1,8 @@
+package com.ytpm.lemonios.feign.feign;
+
+import com.ytpm.lemonios.feign.base.BaseFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "warehouseios-service")
+public interface warehouseIosFeign extends BaseFeign {
+}

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

@@ -115,7 +115,7 @@ public class WxController {
         }
         IosUserInfo userInfo = setIosUserInfo(param);
         param.setLoginIp(getClientIp(request));
-        YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo);
+        YtDyzUser old = appUserService.crudForNewTransIos(param, userInfo, LoginType.IOS.getTypeName());
         //调用风控服务校验默认风控配置
         old.setRiskCode("313");
         Result<?> result = riskFeign.checkRisk(old);
@@ -138,7 +138,7 @@ public class WxController {
         YtDyzUser user = appUserMapper.selectByIosId(param.getIosId());
         if (user == null) {
             IosUserInfo userInfo = setIosUserInfo(param);
-            user = appUserService.crudForNewTransIos(param, userInfo);
+            user = appUserService.crudForNewTransIos(param, userInfo, LoginType.VISITOR.getTypeName());
         }
         //2.拿3条记录 设置到user
         List<YtDyzAdRecord> adRecordList = recordMapper.getByIosIdBeforeLogin(param.getIosId());
@@ -156,10 +156,7 @@ public class WxController {
                 }
             }
         }
-        if (CollUtil.isEmpty(newAdRecordList) || newAdRecordList.size() < 3) {
-            WxDefaultConfig defaultConfig = appUserMapper.getLastDefaultConfig();
-            return Result.resultErr(defaultConfig.getLowValueTip());
-        }
+
         user.setPreAdRecordList(adRecordList);
         user.setLoginType(LoginType.VISITOR);
         user.setAppId(appId);

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

@@ -23,7 +23,7 @@ public interface AppUserService {
     /**
      * 子事务处理用户crud
      */
-    YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo);
+    YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo, String loginType);
 
     Result<?> addDefaultConfig(YtDitch param);
 }

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

@@ -83,7 +83,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo) {
+    public YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo, String loginType) {
         YtDyzUser old = appUserMapper.selectByIosId(param.getIosId());
         if(Objects.isNull(old)) {
             old = new YtDyzUser();
@@ -94,7 +94,7 @@ public class AppUserServiceImpl implements AppUserService {
         //设置最后一次答题问题ID、今日答题数、历史答题数
         setExtInfoForIos(old, userInfo.getHeadimgurl());
         // 添加用户登录记录
-        addLoginRecordForIos(param,old.getUserId());
+        addLoginRecordForIos(param,old.getUserId(), loginType);
         return old;
     }
 
@@ -174,7 +174,7 @@ public class AppUserServiceImpl implements AppUserService {
     /**
      * 增加用户登录记录
      */
-    private void addLoginRecordForIos(IosLoginParam param,String userId) {
+    private void addLoginRecordForIos(IosLoginParam param,String userId, String loginType) {
         YtDyzLoginRecord loginRecord = new YtDyzLoginRecord();
         loginRecord.setRecordId(IdUtil.fastSimpleUUID());
         loginRecord.setUserId(userId);
@@ -185,6 +185,7 @@ public class AppUserServiceImpl implements AppUserService {
         loginRecord.setOperator(param.getIpOperator());
         loginRecord.setIpAddr(param.getIpLocation());
         loginRecord.setPhoneJson(param.getPhoneJson());
+        loginRecord.setLoginType(loginType);
         loginRecordMapper.insertOne(loginRecord);
     }
 

yt-ios-lemon/lemon-ios-service/src/main/resources/mapper/DitchMapper.xml

@@ -38,6 +38,7 @@
         from yt_ditch
         <where>
             is_delete = 0
+            and ditch_name != '掺量勿动'
             <if test="appId != null and appId != ''">
                 and app_id = #{appId}
             </if>