fix：增加体力融合到保存激励视频内

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

@@ -38,6 +38,8 @@ public class WxDefaultConfig {
     private String takuRewardPid;
     @ApiModelProperty("taku插屏")
     private String takuInterstitialPid;
+    @ApiModelProperty("taku插屏")
+    private String takuScreenPid;
     @ApiModelProperty("是否允许root")
     private Integer canUseRoot;
     @ApiModelProperty("是否允许adb")

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

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

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

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

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

@@ -266,19 +266,17 @@ public class WxController {
     @ApiOperation("体力增加")
     @GetMapping("/addPower")
     @Transactional(rollbackFor = Exception.class)
-    public Result<IosPowerResView> addPower(@RequestParam("userId")String userId) {
-        appUserMapper.addOnePower(userId);
-        YtDyzPowerRecord record = new YtDyzPowerRecord();
-        record.setUserId(userId);
-        record.setRecordId(IdUtil.fastSimpleUUID());
-        record.setAddTime(new Date());
-        record.setType(1);
-        record.setRemark("增加体力");
-        appUserMapper.addPowerRecord(record);
-        YtDyzUser user = appUserMapper.selectById(userId);
-        IosPowerResView view = new IosPowerResView();
-        view.setPower(user.getPower());
-        return Result.resultOk(RepMessage.ADD_SUCCESS, view);
+    @Deprecated
+    public Result<YtDyzUser> addPower(@RequestParam("userId") String userId) {
+//        appUserMapper.addOnePower(userId);
+//        YtDyzPowerRecord record = new YtDyzPowerRecord();
+//        record.setUserId(userId);
+//        record.setRecordId(IdUtil.fastSimpleUUID());
+//        record.setAddTime(new Date());
+//        record.setType(1);
+//        record.setRemark("增加体力");
+//        appUserMapper.addPowerRecord(record);
+        return Result.resultOk(RepMessage.ADD_SUCCESS);
     }
 
     @ApiOperation("保存应用默认配置")

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

@@ -26,4 +26,9 @@ public interface AppUserService {
     YtDyzUser crudForNewTransIos(IosLoginParam param, IosUserInfo userInfo, String loginType);
 
     Result<?> addDefaultConfig(YtDitch param);
+
+    /**
+     * 新增体力
+     */
+    void addPower(String userId);
 }

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

@@ -20,6 +20,7 @@ import com.ytpm.general.StatusCode;
 import com.ytpm.lemonios.dao.AdRecordMapper;
 import com.ytpm.lemonios.dao.AppUserMapper;
 import com.ytpm.lemonios.service.AdService;
+import com.ytpm.lemonios.service.AppUserService;
 import com.ytpm.middle.view.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -29,6 +30,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -54,6 +56,9 @@ public class AdServiceImpl implements AdService {
     @Value("${yt.ios.appid:}")
     private String appId;
 
+    @Resource
+    private AppUserService appUserService;
+
     /**
      * 保存广告记录
      */
@@ -89,6 +94,7 @@ public class AdServiceImpl implements AdService {
             saveRecordAndChangeUser(param, user);
             //调用风控广告校验
             if(AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()){
+                appUserService.addPower(user.getUserId());
                 Result<?> result = riskFeign.checkAdRisk(user);
                 if(result.getCode()!=200){
                     return new Result<>(StatusCode.ACCESS_ERR, getTipsMsg());

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

@@ -6,10 +6,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.agent.model.YtDitch;
-import com.ytpm.app.model.YtAppDefaultConfig;
-import com.ytpm.app.model.YtDyzAnswerRecord;
-import com.ytpm.app.model.YtDyzLoginRecord;
-import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.app.model.*;
 import com.ytpm.app.param.IosLoginParam;
 import com.ytpm.app.param.WxLoginParam;
 import com.ytpm.app.view.IosUserInfo;
@@ -121,6 +118,18 @@ public class AppUserServiceImpl implements AppUserService {
         return Result.resultOk(RepMessage.ADD_SUCCESS);
     }
 
+    @Override
+    public void addPower(String userId) {
+        appUserMapper.addOnePower(userId);
+        YtDyzPowerRecord record = new YtDyzPowerRecord();
+        record.setUserId(userId);
+        record.setRecordId(IdUtil.fastSimpleUUID());
+        record.setAddTime(new Date());
+        record.setType(2);
+        record.setRemark("增加体力");
+        appUserMapper.addPowerRecord(record);
+    }
+
     /**
      * 设置扩展信息
      */

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

@@ -56,9 +56,9 @@ public class QuestionServiceImpl implements QuestionService {
         if(!UserStatusEnum.NORMAL.getCode().equals(user.getUserStatus())){
             return new Result<>(StatusCode.ACCESS_ERR,"当前用户处于风控中");
         }
-        if (user.getPower() == null || user.getPower() <= 0) {
-            return new Result<>(StatusCode.ACCESS_ERR, "用户体力不足，无法答题");
-        }
+//        if (user.getPower() == null || user.getPower() <= 0) {
+//            return new Result<>(StatusCode.ACCESS_ERR, "用户体力不足，无法答题");
+//        }
         YtDyzAnswerRecord record = new YtDyzAnswerRecord();
         BeanUtil.copyProperties(param,record);
         record.setRecordId(IdUtil.fastSimpleUUID());

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

@@ -615,6 +615,7 @@
             taku_native_pid,
             taku_reward_pid,
             taku_interstitial_pid,
+            taku_screen_pid,
             can_use_root,
             can_use_adb,
             can_use_float,