Prechádzať zdrojové kódy

游戏回传策略更新

wcc 1 rok pred
rodič
commit
65c2131971

+ 2 - 1
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/controller/BackPolicyController.java

@@ -57,7 +57,8 @@ public class BackPolicyController {
     @DeleteMapping("/del/{ids}")
     @DeleteMapping("/del/{ids}")
     @ApiOperation(value = "删除回传策略")
     @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
-        return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
+        throw new BaseException("暂不支持删除回传策略!");
+        // return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
     }
     }
 
 
     private void checkDTO(GameBackPolicyDTO dto) {
     private void checkDTO(GameBackPolicyDTO dto) {

+ 19 - 19
game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/service/impl/GameBackPolicyServiceImpl.java

@@ -234,23 +234,23 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .userActionSetId(dto.getUserActionSetId())
                 .userActionSetId(dto.getUserActionSetId())
                 .actionParam(actionParam.toString())
                 .actionParam(actionParam.toString())
                 .build();
                 .build();
-            ResultVO<Boolean> result = userActionSetRpc.reportByAppId(dataReportOfAppIdRpcDTO);
-            if (result.getCode() == HttpStatus.HTTP_OK) {
-                gameTencentUser.setIsBack(BackStatusEnum.SUCCESS.getBackStatus());
-                gameTencentUser.setBackLog("回传成功");
-                gameTencentUserService.updateById(gameTencentUser);
+        ResultVO<Boolean> result = userActionSetRpc.reportByAppId(dataReportOfAppIdRpcDTO);
+        if (result.getCode() == HttpStatus.HTTP_OK) {
+            gameTencentUser.setIsBack(BackStatusEnum.SUCCESS.getBackStatus());
+            gameTencentUser.setBackLog("回传成功");
+            gameTencentUserService.updateById(gameTencentUser);
 
 
-                gameTencentBackLog.setBackLog("回传成功");
-                gameTencentBackLogService.save(gameTencentBackLog);
-            } else {
-                log.error("回传腾讯用户失败,失败原因:{}", result.getMsg());
-                gameTencentUser.setBackLog(result.getMsg());
-                gameTencentUser.setIsBack(BackStatusEnum.FAILED.getBackStatus());
-                gameTencentUserService.updateById(gameTencentUser);
+            gameTencentBackLog.setBackLog("回传成功");
+            gameTencentBackLogService.save(gameTencentBackLog);
+        } else {
+            log.error("回传腾讯用户失败,失败原因:{}", result.getMsg());
+            gameTencentUser.setBackLog(result.getMsg());
+            gameTencentUser.setIsBack(BackStatusEnum.FAILED.getBackStatus());
+            gameTencentUserService.updateById(gameTencentUser);
 
 
-                gameTencentBackLog.setBackLog(result.getMsg());
-                gameTencentBackLogService.saveOrUpdate(gameTencentBackLog);
-            }
+            gameTencentBackLog.setBackLog(result.getMsg());
+            gameTencentBackLogService.saveOrUpdate(gameTencentBackLog);
+        }
         return true;
         return true;
 
 
     }
     }
@@ -279,7 +279,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         }
         }
         GameBackPolicy backPolicy = GameBackPolicy.builder()
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .backPolicyName(dto.getBackPolicyName())
                 .backPolicyName(dto.getBackPolicyName())
-                .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
+                .firstMinMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .firstMinMoneyType(dto.getFirstMinMoneyType())
                 .firstMinMoneyType(dto.getFirstMinMoneyType())
                 .firstMinMoneyRate(dto.getFirstMinMoneyRate())
                 .firstMinMoneyRate(dto.getFirstMinMoneyRate())
                 .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
@@ -287,7 +287,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
                 .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
                 .firstOtherMoneyType(dto.getFirstOtherMoneyType())
                 .firstOtherMoneyType(dto.getFirstOtherMoneyType())
                 .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
                 .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
-                .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
+                .rechargeMinMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .rechargeMinMoneyType(dto.getFirstMinMoneyType())
                 .rechargeMinMoneyType(dto.getFirstMinMoneyType())
                 .rechargeMinMoneyRate(dto.getFirstMinMoneyRate())
                 .rechargeMinMoneyRate(dto.getFirstMinMoneyRate())
                 .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
@@ -310,7 +310,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         GameBackPolicy old = getById(policyId);
         GameBackPolicy old = getById(policyId);
         GameBackPolicy backPolicy = GameBackPolicy.builder()
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .backPolicyName(dto.getBackPolicyName())
                 .backPolicyName(dto.getBackPolicyName())
-                .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
+                .firstMinMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .firstMinMoneyType(dto.getFirstMinMoneyType())
                 .firstMinMoneyType(dto.getFirstMinMoneyType())
                 .firstMinMoneyRate(dto.getFirstMinMoneyRate())
                 .firstMinMoneyRate(dto.getFirstMinMoneyRate())
                 .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .firstMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
@@ -318,7 +318,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
                 .firstMaxMoneyRate(dto.getFirstMaxMoneyRate())
                 .firstOtherMoneyType(dto.getFirstOtherMoneyType())
                 .firstOtherMoneyType(dto.getFirstOtherMoneyType())
                 .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
                 .firstOtherMoneyRate(dto.getFirstOtherMoneyRate())
-                .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
+                .rechargeMinMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .rechargeMinMoneyType(dto.getFirstMinMoneyType())
                 .rechargeMinMoneyType(dto.getFirstMinMoneyType())
                 .rechargeMinMoneyRate(dto.getFirstMinMoneyRate())
                 .rechargeMinMoneyRate(dto.getFirstMinMoneyRate())
                 .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())
                 .rechargeMaxMoney(NumberUtil.multiply100(dto.getFirstMaxMoney()).longValue())