修改内容：回传策略创建修改

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/tencent/pojo/dto/TencentOrderDTO.java

@@ -14,6 +14,10 @@ import java.time.LocalDateTime;
 @Builder
 public class TencentOrderDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 游戏ID
      */

game-back/game-back-base/src/main/java/com/zanxiang/game/back/base/tencent/pojo/dto/TencentUserDTO.java

@@ -14,6 +14,10 @@ import java.time.LocalDateTime;
 @Builder
 public class TencentUserDTO implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 游戏ID
      */

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

@@ -28,84 +28,84 @@ public class BackPolicyController {
     @Autowired
     private IGameOceanengineUserLogService oceanengineUserLogService;
 
-    @PreAuthorize(permissionKey = "gameBack:policy:create")
+//    @PreAuthorize(permissionKey = "gameBack:policy:create")
     @PostMapping("/policy/create")
     @ApiOperation(value = "创建回传策略")
     public ResultVO<Boolean> createPolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.createPolicy(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:update")
+//    @PreAuthorize(permissionKey = "gameBack:policy:update")
     @PostMapping("/policy/update")
     @ApiOperation(value = "修改回传策略")
     public ResultVO<Boolean> updatePolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.updatePolicy(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:delete")
+//    @PreAuthorize(permissionKey = "gameBack:policy:delete")
     @PostMapping("/policy/delete/{ids}")
     @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:policy:list")
+//    @PreAuthorize(permissionKey = "gameBack:policy:list")
     @PostMapping("/policy/list")
     @ApiOperation(value = "回传策略列表")
     public ResultVO<IPage<GameBackPolicyVO>> policyList(@RequestBody GameBackPolicyListDTO dto) {
         return ResultVO.ok(gameBackPolicyService.policyList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
     @PostMapping("/tencent/orderLogs")
     @ApiOperation(value = "腾讯订单回传日志列表")
     public ResultVO<IPage<GameTencentOrderVO>> tencentOrderLogList(@RequestBody GameTencentOrderDTO dto) {
         return ResultVO.ok(tencentOrderService.tencentOrderLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
     @PostMapping("/tencent/orderReport/{ids}")
     @ApiOperation(value = "腾讯订单手动上报")
     public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(tencentOrderService.tencentOrderReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
     @PostMapping("/tencent/userLogs")
     @ApiOperation(value = "腾讯用户回传日志列表")
     public ResultVO<IPage<GameTencentUserVO>> tencentUserLogList(@RequestBody GameTencentUserDTO dto) {
         return ResultVO.ok(tencentUserService.tencentUserLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
+//    @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
     @PostMapping("/tencent/userReport/{ids}")
     @ApiOperation(value = "腾讯用户手动上报")
     public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(tencentUserService.tencentUserReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
     @PostMapping("/oceanengine/orderLogs")
     @ApiOperation(value = "头条订单回传日志列表")
     public ResultVO<IPage<GameOceanengineOrderLogVO>> oceanengineOrderLogList(@RequestBody GameOceanengineOrderLogDTO dto) {
         return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
     @PostMapping("/oceanengine/orderReport/{ids}")
     @ApiOperation(value = "头条订单手动上报")
     public ResultVO<Boolean> oceanengineOrderReport(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderReport(ids));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
     @PostMapping("/oceanengine/userLogs")
     @ApiOperation(value = "头条用户回传日志列表")
     public ResultVO<IPage<GameOceanengineUserLogVO>> oceanengineUserLogList(@RequestBody GameOceanengineUserLogDTO dto) {
         return ResultVO.ok(oceanengineUserLogService.oceanengineUserLogList(dto));
     }
 
-    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
+//    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
     @PostMapping("/oceanengine/userReport/{ids}")
     @ApiOperation(value = "头条用户手动上报")
     public ResultVO<Boolean> oceanengineUserReport(@PathVariable("ids") List<Long> ids) {

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyDTO.java

@@ -34,18 +34,6 @@ public class GameBackPolicyDTO implements Serializable {
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/dto/GameBackPolicyListDTO.java

@@ -25,24 +25,6 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @Builder
 public class GameBackPolicyListDTO extends BaseListDTO<GameBackPolicy> {
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
-    @ApiModelProperty("创建者")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
 }

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameBackPolicy.java

@@ -32,16 +32,6 @@ public class GameBackPolicy implements Serializable {
 
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentOrder.java

@@ -25,7 +25,10 @@ public class GameTencentOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
     /**
      * 渠道号
      */

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/entity/GameTencentUser.java

@@ -25,6 +25,10 @@ public class GameTencentUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
+    /**
+     * 回传策略ID
+     */
+    private Long backPolicyId;
 
     /**
      * 渠道号

game-back/game-back-serve/src/main/java/com/zanxiang/game/back/serve/pojo/vo/GameBackPolicyVO.java

@@ -31,18 +31,6 @@ public class GameBackPolicyVO implements Serializable {
     @ApiModelProperty("回传策略名")
     private String backPolicyName;
 
-    /**
-     * 游戏ID
-     */
-    @ApiModelProperty("游戏ID")
-    private Long gameId;
-
-    /**
-     * 账号ID
-     */
-    @ApiModelProperty("账号ID")
-    private Long accountId;
-
     /**
      * 首充金额（小于等于指定金额）
      */

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

@@ -80,6 +80,7 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .orderStatus(dto.getOrderStatus())
                 .payTime(dto.getPayTime())
                 .isBack(BackStatusEnum.NO.getBackStatus())
+                .backPolicyId(dto.getBackPolicyId())
                 .build();
         gameTencentOrderService.save(gameTencentOrder);
         if (!dto.getOrderStatus().equals(COMPLETE_ORDER) && !dto.getOrderStatus().equals(PURCHASE)) {
@@ -111,14 +112,10 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .wechatOpenid(dto.getWechatOpenid())
                 .build();
 
-        GameBackPolicy gameBackPolicy = gameBackPolicyService.getOne(new LambdaQueryWrapper<GameBackPolicy>()
-                .eq(GameBackPolicy::getGameId, dto.getGameId())
-                .eq(GameBackPolicy::getAccountId, dto.getAdAccountId()));
-        if (null == gameBackPolicy) {
-            gameBackPolicy = gameBackPolicyService.getOne(new LambdaQueryWrapper<GameBackPolicy>()
-                    .eq(GameBackPolicy::getGameId, dto.getGameId())
-                    .isNull(GameBackPolicy::getAccountId));
+        if (null == dto.getBackPolicyId()){
+            return false;
         }
+        GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(dto.getBackPolicyId());
 
         boolean doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
                 gameTencentOrderService.list(new LambdaQueryWrapper<GameTencentOrder>()
@@ -227,8 +224,6 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         }
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .backPolicyName(dto.getBackPolicyName())
-                .gameId(dto.getGameId())
-                .accountId(dto.getAccountId())
                 .firstRechargeMoney(dto.getFirstRechargeMoney())
                 .firstRechargeBackPercentage(dto.getFirstRechargeBackPercentage())
                 .bigRechargeBackPercentage(dto.getBigRechargeBackPercentage())
@@ -254,8 +249,6 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
         GameBackPolicy backPolicy = GameBackPolicy.builder()
                 .id(dto.getId())
                 .backPolicyName(dto.getBackPolicyName())
-                .gameId(dto.getGameId())
-                .accountId(dto.getAccountId())
                 .firstRechargeMoney(dto.getFirstRechargeMoney())
                 .firstRechargeBackPercentage(dto.getFirstRechargeBackPercentage())
                 .bigRechargeBackPercentage(dto.getBigRechargeBackPercentage())
@@ -278,13 +271,10 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
     public IPage<GameBackPolicyVO> policyList(GameBackPolicyListDTO dto) {
         return gameBackPolicyService.page(dto.toPage(), new LambdaQueryWrapper<GameBackPolicy>()
                         .like(StringUtils.isNotBlank(dto.getBackPolicyName()), GameBackPolicy::getBackPolicyName, dto.getBackPolicyName())
-                        .eq(null != dto.getGameId(), GameBackPolicy::getGameId, dto.getGameId())
-                        .eq(null != dto.getAccountId(), GameBackPolicy::getAccountId, dto.getAccountId())
-                        .eq(null != dto.getCreateBy(), GameBackPolicy::getCreateBy, dto.getCreateBy()))
+                        .eq(GameBackPolicy::getCreateBy,SecurityUtil.getUserId()))
                 .convert(item -> GameBackPolicyVO.builder()
                         .id(item.getId())
                         .backPolicyName(item.getBackPolicyName())
-                        .accountId(item.getAccountId())
                         .bigRechargeBackPercentage(item.getBigRechargeBackPercentage())
                         .bigRechargeMoney(item.getBigRechargeMoney())
                         .firstRechargeBackPercentage(item.getFirstRechargeBackPercentage())