fix:游客登陆校验缺陷及逻辑优化

yt-adage/adage-service/src/main/java/com/ytpm/adage/service/impl/VisitorLoginServiceImpl.java

@@ -23,6 +23,7 @@ import com.ytpm.feign.RiskFeign;
 import com.ytpm.general.Result;
 import com.ytpm.handle.AbstractLoginService;
 import com.ytpm.handle.CommonException;
+import com.ytpm.handle.CustomerException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -158,8 +159,8 @@ public class VisitorLoginServiceImpl extends AbstractLoginService  {
 
 
     // 仅保存登陆时的三条广告信息 并传入登陆实体用于后续 risk风控校验
-    protected void saveVisitorAdRecord(YtDyzUser ytDyzUser, LoginParam loginParam) {
-        super.saveVisitorAdRecord(ytDyzUser, loginParam);
+    protected void saveVisitorAdRecord(YtDyzUser ytDyzUser, LoginParam loginParam, WxDefaultConfig defaultConfig) {
+        super.saveVisitorAdRecord(ytDyzUser, loginParam, defaultConfig);
         VisitorLoginParam visitorLoginParam = (VisitorLoginParam) loginParam;
         List<DyzAdRecordParam> preAdList = visitorLoginParam.getPreAdList();
         List<String> adRecordIds = new ArrayList<>();
@@ -169,6 +170,9 @@ public class VisitorLoginServiceImpl extends AbstractLoginService  {
                 adRecordIds.add(recordId);
             }
         }
+        if(CollUtil.isEmpty(adRecordIds)) {
+            throw new CustomerException(defaultConfig.getLowValueTip());
+        }
         ytDyzUser.setPreAdRecordList(adService.queryRecordByIds(adRecordIds));
     }
 

yt-adage/adage-service/src/main/resources/mapper/AppUserMapper.xml

@@ -367,7 +367,7 @@
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type,user_path,login_path,ad_path,answer_path,power_path
                      ,can_simulator,taku_app_id,taku_key,taku_banner_pid,taku_interstitial_pid,taku_reward_pid,taku_native_pid,can_use_adb,can_accumulation,can_use_float,can_use_root,ditch_id,power_wait_time,interstitial_interval_time,
-            low_value_tops, brush_tip
+            low_value_tip, brush_tip
         from yt_app_default_config
         where app_type = #{appType}
     </select>

yt-common/src/main/java/com/ytpm/app/view/WxDefaultConfig.java

@@ -51,4 +51,10 @@ public class WxDefaultConfig {
     private Integer interstitialIntervalTime;
     @ApiModelProperty("渠道类型id")
     private String ditchId;
+
+    @ApiModelProperty("用户低收益提示语")
+    private String lowValueTip;
+
+    @ApiModelProperty("刷子提示语")
+    private String brushTip;
 }

yt-common/src/main/java/com/ytpm/handle/AbstractLoginService.java

@@ -81,6 +81,7 @@ public abstract class AbstractLoginService {
         YtDyzUser ytDyzUser;
         if (getLoginType() == LoginType.VISITOR) {
             // 游客模式
+            paramMap.put("defaultConfig", defaultConfig);
             ytDyzUser = visitorLoginHandle(loginParam, paramMap);
         } else {
             ytDyzUser = clientLoginHandle(loginParam, paramMap);
@@ -144,12 +145,13 @@ public abstract class AbstractLoginService {
             deadWithUserCrud(loginParam, ytDyzUser, paramMap);
         }
         // 保存广告信息
-        saveVisitorAdRecord(ytDyzUser, loginParam);
+        WxDefaultConfig defaultConfig = (WxDefaultConfig) paramMap.get("defaultConfig");
+        saveVisitorAdRecord(ytDyzUser, loginParam, defaultConfig);
         return ytDyzUser;
     }
 
     // 游客登陆时保存传递记录
-    protected void saveVisitorAdRecord(YtDyzUser ytDyzUser, LoginParam loginParam) {
+    protected void saveVisitorAdRecord(YtDyzUser ytDyzUser, LoginParam loginParam, WxDefaultConfig defaultConfig) {
 
     }