fix:新增广告平台枚举；新增体力逻辑合并至保存广告接口并废弃体力增加接口

yt-common/src/main/java/com/ytpm/advertise/enums/AdPlatformTypeEnum.java

@@ -14,6 +14,7 @@ public enum AdPlatformTypeEnum {
     KUAI_SHOU(28, "快手"),
     SIGMOB(29, "Sigmob"),
     HUAWEI(39, "华为广告"),
+    GROMORE(46, "gromore"),
     Mi_Uion(49, "米盟"),
     JAN(72, "京媒平台"),
     QM(74, "趣盟"),

yt-question/yt-question-service/src/main/java/com/ytpm/question/controller/WxController.java

@@ -1,7 +1,6 @@
 package com.ytpm.question.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
@@ -9,7 +8,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.ytpm.app.enums.AppTypeEnums;
 import com.ytpm.app.enums.LoginType;
 import com.ytpm.app.model.YtAppDefaultConfig;
-import com.ytpm.app.model.YtDyzPowerRecord;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppConfigUpdateParam;
 import com.ytpm.app.param.WxLoginParam;
@@ -150,15 +148,16 @@ public class WxController {
     @ApiOperation("体力增加")
     @GetMapping("/addPower")
     @Transactional(rollbackFor = Exception.class)
+    @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);
+//        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);
     }
 

yt-question/yt-question-service/src/main/java/com/ytpm/question/service/AppUserService.java

@@ -15,4 +15,9 @@ public interface AppUserService {
      * 子事务处理用户crud
      */
     YtDyzUser crudForNewTrans(WxLoginParam param, WxUserInfo wxUserInfo, WxLoginResult loginResult);
+
+    /**
+     * 新增体力
+     */
+    void addPower(String userId);
 }

yt-question/yt-question-service/src/main/java/com/ytpm/question/service/impl/AdServiceImpl.java

@@ -31,6 +31,7 @@ import com.ytpm.middle.view.UserRankingListVO;
 import com.ytpm.question.dao.AdRecordMapper;
 import com.ytpm.question.dao.AppUserMapper;
 import com.ytpm.question.service.AdService;
+import com.ytpm.question.service.AppUserService;
 import com.ytpm.question.view.AgentNetworkAgg;
 import com.ytpm.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,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.util.ArrayList;
@@ -64,6 +66,8 @@ public class AdServiceImpl implements AdService {
     private AppUserMapper appUserMapper;
     @Autowired
     private RiskFeign riskFeign;
+    @Resource
+    private AppUserService appUserService;
 
     @Value(" ${risk.config.banned.tips:}")
     private String tips;
@@ -85,6 +89,7 @@ public class AdServiceImpl implements AdService {
         saveRecordAndChangeUser(param, user);
         //调用风控广告校验
         if (AdSourceTypeEnum.rewarded_video.getAdSourceType() == param.getAdSourceType()) {
+            appUserService.addPower(user.getUserId());
             WxDefaultConfig config = appUserMapper.getDefaultConfigByAppId(user.getAppId());
             String format = StrUtil.emptyToDefault(config.getTaskLimitTip(), "当前设备完成任务次数过多，请{}后重试！");
             user.setPowerLimitTip(format);

yt-question/yt-question-service/src/main/java/com/ytpm/question/service/impl/AppUserServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.app.model.YtDyzLoginRecord;
+import com.ytpm.app.model.YtDyzPowerRecord;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.WxLoginParam;
 import com.ytpm.app.view.WxLoginResult;
@@ -84,6 +85,18 @@ public class AppUserServiceImpl implements AppUserService {
         return old;
     }
 
+    @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);
+    }
+
     /**
      * 设置扩展信息
      */