Преглед изворни кода

fix:修复agent同步缺陷

hidewnd пре 12 часа
родитељ
комит
bb7e6dae2c

+ 68 - 6
yt-agent/agent-service/src/main/resources/mapper/AppMapper.xml

@@ -155,21 +155,83 @@
         where app_id in <foreach collection="ids" item="appId" open="(" separator="," close=")">#{appId}</foreach>;
     </delete>
     <select id="selectPrimary" resultType="com.ytpm.agent.model.YtApp">
-        select
-            app_id,ditch_id, ditch_name,  app_key, app_name,user_id, app_type, apk_url, qr_code, version_code, update_tips, enabled,superior_id
+        select app_id,
+               ditch_id,
+               ditch_name,
+               app_key,
+               app_name,
+               user_id,
+               app_type,
+               apk_url,
+               qr_code,
+               version_code,
+               update_tips,
+               enabled,
+               superior_id,
+               ditch_id,
+               revenue_display_rate,
+               create_time
         from yt_app
         where app_id = #{appId}
     </select>
     <select id="queryAll" resultType="com.ytpm.agent.model.YtApp">
-        select
-            app_id, ditch_id, ditch_name, app_key, app_name, user_id, app_type, apk_url, qr_code, version_code, update_tips, enabled, store_on_sale, store_type, store_url, package_name, domain, category, sub_category, coppa, screen_orientation, ccpa, superior_id
+        select app_id,
+               app_key,
+               app_name,
+               user_id,
+               app_type,
+               apk_url,
+               qr_code,
+               version_code,
+               update_tips,
+               enabled,
+               store_on_sale,
+               store_type,
+               store_url,
+               package_name,
+               domain,
+               category,
+               sub_category,
+               coppa,
+               screen_orientation,
+               ccpa,
+               feign_path,
+               ditch_id,
+               ditch_name,
+               superior_id,
+               revenue_display_rate,
+               create_time
         from yt_app
         where user_id = #{userId}
     </select>
 
     <select id="selectByDitchId" resultType="com.ytpm.agent.model.YtApp">
-        select
-            app_id, ditch_id, ditch_name, app_key, app_name,user_id, app_type, apk_url, qr_code, version_code, update_tips, enabled,ditch_name,ditch_id
+        select app_id,
+               app_key,
+               app_name,
+               user_id,
+               app_type,
+               apk_url,
+               qr_code,
+               version_code,
+               update_tips,
+               enabled,
+               store_on_sale,
+               store_type,
+               store_url,
+               package_name,
+               domain,
+               category,
+               sub_category,
+               coppa,
+               screen_orientation,
+               ccpa,
+               feign_path,
+               ditch_id,
+               ditch_name,
+               superior_id,
+               revenue_display_rate,
+               create_time
         from yt_app
         where ditch_id = #{ditchId} and enabled = 1
     </select>

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

@@ -278,26 +278,6 @@ public class WxController {
         dyzUser.setUserStatus(UserStatusEnum.NORMAL.getCode());
         newUser.setUserStatus(UserStatusEnum.NORMAL.getCode());
         appUserMapper.updateUser(newUser);
-        param.setLoginIp(HttpClientUtil.getClientIp(request));
-        YtDyzUser dyzUser = appUserService.crudForNewTransIos(param, userInfo, LoginType.IOS.getTypeName());
-        // 游客登陆校验
-        if (CollUtil.isNotEmpty(param.getPreAdList())) {
-            dyzUser.setLoginType(LoginType.VISITOR);
-            saveVisitorAdRecord(dyzUser, param, defaultConfig);
-            Result<?> result = riskFeign.checkLoginRisk(dyzUser);
-            if (result.getCode() != 200) {
-                String errorMessage = result.getMessage();
-                if (RepMessage.RISK_VISITOR_LOWER_VALUE.equals(errorMessage)) {
-                    return Result.resultErr(StrUtil.emptyToDefault(defaultConfig.getLowValueTip(), errorMessage));
-                }
-                return Result.resultErr(errorMessage);
-            }
-        }
-        // 状态 游客登陆前风控 -> 正常
-        YtDyzUser newUser = new YtDyzUser();
-        newUser.setUserId(dyzUser.getUserId());
-        newUser.setUserStatus(UserStatusEnum.NORMAL.getCode());
-        appUserMapper.updateUser(newUser);
         //调用风控服务校验默认风控配置
         dyzUser.setLoginType(LoginType.IOS);
         dyzUser.setRiskCode("313");