Преглед на файлове

校验已出包渠道不得重复使用
风控配置初始值

marxjaw преди 3 месеца
родител
ревизия
dfbe57d9a6

+ 5 - 0
yt-agent/agent-service/src/main/java/com/ytpm/dao/AppMapper.java

@@ -40,4 +40,9 @@ public interface AppMapper {
      *  应用列表
      *  应用列表
      */
      */
     List<AppListVO> getAppList(AppListParam param);
     List<AppListVO> getAppList(AppListParam param);
+
+    /**
+     * 根据母包和渠道查询应用
+     */
+    YtApp getByDitchIdAndSuperiorId(@Param("ditchId") Long ditchId, @Param("superiorId") String superiorId);
 }
 }

+ 5 - 0
yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AgentAppServiceImpl.java

@@ -112,6 +112,11 @@ public class AgentAppServiceImpl implements AgentAppService {
         if(CharSequenceUtil.isNotBlank(param.getAppId())){
         if(CharSequenceUtil.isNotBlank(param.getAppId())){
             appMapper.updateOne(app);
             appMapper.updateOne(app);
         }else{
         }else{
+            //同一个应用同一个渠道只能出一个包
+            YtApp exist =  appMapper.getByDitchIdAndSuperiorId(param.getDitchId(),param.getSuperiorId());
+            if(Objects.nonNull(exist)){
+                throw new CustomerException("该渠道已存在:"+exist.getAppName()+", 请选择其他渠道");
+            }
             app.setAppId(IdUtil.fastSimpleUUID());
             app.setAppId(IdUtil.fastSimpleUUID());
             app.setUserId(userId);
             app.setUserId(userId);
             app.setEnabled(1);
             app.setEnabled(1);

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

@@ -177,4 +177,10 @@
         order by
         order by
         pua.issued_time
         pua.issued_time
     </select>
     </select>
+    <select id="getByDitchIdAndSuperiorId" resultType="com.ytpm.agent.model.YtApp">
+        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
+        from yt_app
+        where superior_id = #{superiorId} and ditch_id = #{ditchId}
+    </select>
 </mapper>
 </mapper>

+ 7 - 5
yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/ApkServiceImpl.java

@@ -81,12 +81,14 @@ public class ApkServiceImpl implements ApkService {
     public Result<?> saveApp(AppParam param, MiddleUserInfo loginUser) {
     public Result<?> saveApp(AppParam param, MiddleUserInfo loginUser) {
         //数据库操作,有appId为修改, 没有时为新增
         //数据库操作,有appId为修改, 没有时为新增
         changeDataAction(param,loginUser.getUserId());
         changeDataAction(param,loginUser.getUserId());
-        //如果是修改则直接返回
         if(CharSequenceUtil.isNotBlank(param.getAppId())){
         if(CharSequenceUtil.isNotBlank(param.getAppId())){
+            //修改时判断已生成风控配置,则说明出过包,仅需更换即可
+            YtRiskTemplate template =  riskMapper.getTemplateByAppId(param.getAppId());
+            if(Objects.isNull(template)){
+                generateRiskDefaultConfig(param.getAppId(),param.getUserId(),loginUser);
+            }
             return Result.resultOk(RepMessage.SAVE_SUCCESS);
             return Result.resultOk(RepMessage.SAVE_SUCCESS);
         }
         }
-        //如果是新增则生成风控参数
-        generateRiskDefaultConfig(param.getAppId(),param.getUserId(),loginUser);
         return Result.resultOk(RepMessage.SAVE_SUCCESS);
         return Result.resultOk(RepMessage.SAVE_SUCCESS);
     }
     }
 
 
@@ -116,7 +118,7 @@ public class ApkServiceImpl implements ApkService {
             riskMapper.insertTempConfig(templateConfig);
             riskMapper.insertTempConfig(templateConfig);
         }
         }
         YtRiskTemplate template = new YtRiskTemplate(templateId,"最低收益限制",
         YtRiskTemplate template = new YtRiskTemplate(templateId,"最低收益限制",
-                "当日前2条获得奖励的激励视频,总收益为<0.21",appId+"-746",agentId,
+                "当日前2条获得奖励的激励视频,总收益为<"+initRevenue,appId+"-746",agentId,
                 2,appId,new Date(),loginUser.getUserId(),null,
                 2,appId,new Date(),loginUser.getUserId(),null,
                 null,1,1,1);
                 null,1,1,1);
         riskMapper.insertTemplate(template);
         riskMapper.insertTemplate(template);
@@ -143,7 +145,7 @@ public class ApkServiceImpl implements ApkService {
             riskMapper.insertTempConfig(templateConfig);
             riskMapper.insertTempConfig(templateConfig);
         }
         }
         YtRiskTemplate template = new YtRiskTemplate(templateId,"激励视频ecpm值控制",
         YtRiskTemplate template = new YtRiskTemplate(templateId,"激励视频ecpm值控制",
-                "当日前4条激励视频,有2条,ecpm值为<35",appId+"-742",agentId,
+                "当日前4条激励视频,有2条,ecpm值为<"+initEcpm,appId+"-742",agentId,
                 2,appId,new Date(),loginUser.getUserId(),null,
                 2,appId,new Date(),loginUser.getUserId(),null,
                 null,1,1,1);
                 null,1,1,1);
         riskMapper.insertTemplate(template);
         riskMapper.insertTemplate(template);