修改代理商查看ecpm

修改ADS 出包 和 应用管理增加的字段

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/YtAppUserServiceImpl.java

@@ -141,7 +141,7 @@ public class YtAppUserServiceImpl implements YtAppUserService {
     public ResultTable<YtUserEcpmListView> ecpmList(String appId,String userId,Integer adsourceType) {
         YtApp ytApp = appMapper.selectPrimary(appId);
         YtPlatformUserApp app = agentAppMapper.selectByPrimaryKey(ytApp.getSuperiorId());
-        Object o = feignInvoker.invoke(app.getServiceName(), "adRecords", userId,888);
+        Object o = feignInvoker.invoke(app.getServiceName(), "adRecords", userId,Objects.isNull(adsourceType)?888:adsourceType);
         JSONObject object = JSONObject.parseObject(JSON.toJSONString(o));
         List<YtDyzAdRecord> records = JSONArray.parseArray(object.getString("data"), YtDyzAdRecord.class);
         PageMeta pageMeta = JSON.parseObject(object.getString("pageMeta"), PageMeta.class);

yt-common/src/main/java/com/ytpm/agent/param/AppParam.java

@@ -64,6 +64,8 @@ public class AppParam {
     private Integer canUseFloat;
     @ApiModelProperty("是否允许累加体力")
     private Integer canAccumulation;
+    @ApiModelProperty("是否允许模拟器")
+    private Integer canSimulator;
     @ApiModelProperty("体力等待时间（秒）")
     private Integer powerWaitTime;
     @ApiModelProperty("插屏间隔时间（秒）")

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/AppController.java

@@ -47,7 +47,6 @@ public class AppController {
         form.setCreateUserId(userInfo.getUserId());
         return appService.addApp(form);
     }
-
     /**
      * 修改上架应用信息
      */

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/OutsourcingController.java

@@ -43,4 +43,13 @@ public class OutsourcingController {
     public Result<?> saveApp(@RequestBody AppParam param, @ApiIgnore @AuthenticationPrincipal MiddleUserInfo userInfo) {
         return apkService.saveApp(param,userInfo);
     }
+
+    /**
+     * 修改子包配置
+     */
+    @ApiOperation("修改子包配置")
+    @PostMapping("/changeConfig")
+    public Result<?> changeConfig(@RequestBody AppParam param) {
+        return apkService.changeConfig(param);
+    }
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/ApkService.java

@@ -18,4 +18,9 @@ public interface ApkService {
      * 保存应用
      */
     Result<?> saveApp(AppParam param, MiddleUserInfo userInfo);
+
+    /**
+     * 修改子包配置
+     */
+    Result<?> changeConfig(AppParam param);
 }

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

@@ -114,12 +114,36 @@ public class ApkServiceImpl implements ApkService {
         return Result.resultOk(RepMessage.SAVE_SUCCESS);
     }
 
+    /**
+     * 修改子包配置
+     */
+    @Override
+    public Result<?> changeConfig(AppParam param) {
+        //出包修改 default_config
+        changeDefaultConfig(param);
+        return Result.resultOk(RepMessage.SAVE_SUCCESS);
+    }
+
     /**
      * 出包修改对应子包的默认配置
      */
     private void changeDefaultConfig(AppParam param) {
-        YtAppDefaultConfig config = new YtAppDefaultConfig();
         YtPlatformUserApp app = appMapper.getByPrimary(param.getSuperiorId());
+        YtAppDefaultConfig config = new YtAppDefaultConfig();
+        config.setAppId(param.getAppId());
+        config.setDitchId(param.getDitchId().toString());
+        config.setTakuAppId(app.getTakuAppId());
+        config.setTakuKey(app.getTakuKey());
+        config.setTakuBannerPid(app.getTakuBannerPid());
+        config.setTakuNativePid(app.getTakuNativePid());
+        config.setTakuRewardPid(app.getTakuRewardPid());
+        config.setTakuInterstitialPid(app.getTakuInterstitialPid());
+        config.setCanAccumulation(param.getCanAccumulation());
+        config.setCanUseAdb(param.getCanUseAdb());
+        config.setCanUseFloat(param.getCanUseFloat());
+        config.setCanUseRoot(param.getCanUseRoot());
+        config.setPowerWaitTime(param.getPowerWaitTime());
+        config.setInterstitialIntervalTime(param.getInterstitialIntervalTime());
         feignInvoker.invoke(app.getServiceName(), "updateAppConfig",config);
     }
 

yt-middle/middle-platform/src/main/resources/mapper/AppMapper.xml

@@ -194,7 +194,7 @@
     </select>
     <select id="getByPrimary" resultType="com.ytpm.agent.model.YtPlatformUserApp">
         select
-            app_id, app_name, user_id,sale_price,grant_type, app_type,service_name, detail_url, package_name, domain, issued_time, wx_app_id,wx_secret
+            app_id, app_name, user_id, app_type, detail_url, package_name, domain, issued_time, wx_app_id, wx_secret, sale_price, grant_type, charge_status, feign_class_path, service_name, create_time, create_user_id, update_time, update_user_id, available, taku_app_id, taku_key, taku_banner_pid, taku_native_pid, taku_reward_pid, taku_interstitial_pid
         from yt_platform_user_app
         where app_id = #{appId}
     </select>