Merge remote-tracking branch 'origin/package' into package

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

@@ -14,101 +14,44 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 @RestController
-@RequestMapping("/game/back")
+@RequestMapping("/policy")
 @Api("回传策略")
 public class BackPolicyController {
     @Autowired
     private IGameBackPolicyService gameBackPolicyService;
-    @Autowired
-    private IGameTencentUserService tencentUserService;
-    @Autowired
-    private IGameTencentOrderService tencentOrderService;
-    @Autowired
-    private IGameOceanengineOrderLogService oceanengineOrderLogService;
-    @Autowired
-    private IGameOceanengineUserLogService oceanengineUserLogService;
 
-//    @PreAuthorize(permissionKey = "gameBack:policy:create")
-    @PostMapping("/policy/create")
+    @ApiOperation(value = "创建回传策略")
+    @PreAuthorize(permissionKey = "gameBack:policy:allOfUser")
+    @GetMapping("/allOfUser")
+    public ResultVO<List<GameBackPolicyVO>> allOfUser() {
+        return ResultVO.ok(gameBackPolicyService.allOfUser());
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:policy:list")
+    @PostMapping("/list")
+    @ApiOperation(value = "回传策略列表")
+    public ResultVO<IPage<GameBackPolicyVO>> policyList(@RequestBody GameBackPolicyListDTO dto) {
+        return ResultVO.ok(gameBackPolicyService.policyList(dto));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:policy:create")
+    @PostMapping("/create")
     @ApiOperation(value = "创建回传策略")
     public ResultVO<Boolean> createPolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.createPolicy(dto));
     }
 
-//    @PreAuthorize(permissionKey = "gameBack:policy:update")
-    @PostMapping("/policy/update")
+    @PreAuthorize(permissionKey = "gameBack:policy:update")
+    @PostMapping("/update")
     @ApiOperation(value = "修改回传策略")
     public ResultVO<Boolean> updatePolicy(@RequestBody GameBackPolicyDTO dto) {
         return ResultVO.ok(gameBackPolicyService.updatePolicy(dto));
     }
 
-//    @PreAuthorize(permissionKey = "gameBack:policy:delete")
-    @PostMapping("/policy/delete/{ids}")
+    @PreAuthorize(permissionKey = "gameBack:policy:delete")
+    @PostMapping("/delete/{ids}")
     @ApiOperation(value = "删除回传策略")
     public ResultVO<Boolean> deletePolicy(@PathVariable("ids") List<Long> ids) {
         return ResultVO.ok(gameBackPolicyService.deletePolicy(ids));
     }
-
-//    @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")
-    @PostMapping("/tencent/orderLogs")
-    @ApiOperation(value = "腾讯订单回传日志列表")
-    public ResultVO<IPage<GameTencentOrderVO>> tencentOrderLogList(@RequestBody GameTencentOrderDTO dto) {
-        return ResultVO.ok(tencentOrderService.tencentOrderLogList(dto));
-    }
-
-//    @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")
-    @PostMapping("/tencent/userLogs")
-    @ApiOperation(value = "腾讯用户回传日志列表")
-    public ResultVO<IPage<GameTencentUserVO>> tencentUserLogList(@RequestBody GameTencentUserDTO dto) {
-        return ResultVO.ok(tencentUserService.tencentUserLogList(dto));
-    }
-
-//    @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")
-    @PostMapping("/oceanengine/orderLogs")
-    @ApiOperation(value = "头条订单回传日志列表")
-    public ResultVO<IPage<GameOceanengineOrderLogVO>> oceanengineOrderLogList(@RequestBody GameOceanengineOrderLogDTO dto) {
-        return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderLogList(dto));
-    }
-
-//    @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")
-    @PostMapping("/oceanengine/userLogs")
-    @ApiOperation(value = "头条用户回传日志列表")
-    public ResultVO<IPage<GameOceanengineUserLogVO>> oceanengineUserLogList(@RequestBody GameOceanengineUserLogDTO dto) {
-        return ResultVO.ok(oceanengineUserLogService.oceanengineUserLogList(dto));
-    }
-
-//    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
-    @PostMapping("/oceanengine/userReport/{ids}")
-    @ApiOperation(value = "头条用户手动上报")
-    public ResultVO<Boolean> oceanengineUserReport(@PathVariable("ids") List<Long> ids) {
-        return ResultVO.ok(oceanengineUserLogService.oceanengineUserReport(ids));
-    }
 }

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

@@ -0,0 +1,59 @@
+package com.zanxiang.game.back.serve.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineOrderLogDTO;
+import com.zanxiang.game.back.serve.pojo.dto.GameOceanengineUserLogDTO;
+import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineOrderLogVO;
+import com.zanxiang.game.back.serve.pojo.vo.GameOceanengineUserLogVO;
+import com.zanxiang.game.back.serve.service.IGameOceanengineOrderLogService;
+import com.zanxiang.game.back.serve.service.IGameOceanengineUserLogService;
+import com.zanxiang.module.util.pojo.ResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/oceanengine")
+@Api("回传策略")
+public class OceanengineLogController {
+    @Autowired
+    private IGameOceanengineOrderLogService oceanengineOrderLogService;
+    @Autowired
+    private IGameOceanengineUserLogService oceanengineUserLogService;
+
+    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderLogs")
+    @PostMapping("/orderLogs")
+    @ApiOperation(value = "头条订单回传日志列表")
+    public ResultVO<IPage<GameOceanengineOrderLogVO>> oceanengineOrderLogList(@RequestBody GameOceanengineOrderLogDTO dto) {
+        return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderLogList(dto));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:oceanengine:orderReport")
+    @PostMapping("/orderReport/{ids}")
+    @ApiOperation(value = "头条订单手动上报")
+    public ResultVO<Boolean> oceanengineOrderReport(@PathVariable("ids") List<Long> ids) {
+        return ResultVO.ok(oceanengineOrderLogService.oceanengineOrderReport(ids));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:oceanengine:userLogs")
+    @PostMapping("/userLogs")
+    @ApiOperation(value = "头条用户回传日志列表")
+    public ResultVO<IPage<GameOceanengineUserLogVO>> oceanengineUserLogList(@RequestBody GameOceanengineUserLogDTO dto) {
+        return ResultVO.ok(oceanengineUserLogService.oceanengineUserLogList(dto));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:oceanengine:userReport")
+    @PostMapping("/userReport/{ids}")
+    @ApiOperation(value = "头条用户手动上报")
+    public ResultVO<Boolean> oceanengineUserReport(@PathVariable("ids") List<Long> ids) {
+        return ResultVO.ok(oceanengineUserLogService.oceanengineUserReport(ids));
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.zanxiang.game.back.serve.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zanxiang.erp.security.annotation.PreAuthorize;
+import com.zanxiang.game.back.serve.pojo.dto.GameTencentOrderDTO;
+import com.zanxiang.game.back.serve.pojo.dto.GameTencentUserDTO;
+import com.zanxiang.game.back.serve.pojo.vo.GameTencentOrderVO;
+import com.zanxiang.game.back.serve.pojo.vo.GameTencentUserVO;
+import com.zanxiang.game.back.serve.service.IGameTencentOrderService;
+import com.zanxiang.game.back.serve.service.IGameTencentUserService;
+import com.zanxiang.module.util.pojo.ResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/tencent")
+@Api("回传策略")
+public class TencentLogController {
+    @Autowired
+    private IGameTencentUserService tencentUserService;
+    @Autowired
+    private IGameTencentOrderService tencentOrderService;
+
+    @PreAuthorize(permissionKey = "gameBack:tencent:orderLogs")
+    @PostMapping("/orderLogs")
+    @ApiOperation(value = "腾讯订单回传日志列表")
+    public ResultVO<IPage<GameTencentOrderVO>> tencentOrderLogList(@RequestBody GameTencentOrderDTO dto) {
+        return ResultVO.ok(tencentOrderService.tencentOrderLogList(dto));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:tencent:orderReport")
+    @PostMapping("/orderReport/{ids}")
+    @ApiOperation(value = "腾讯订单手动上报")
+    public ResultVO<Boolean> tencentOrderReport(@PathVariable("ids") List<Long> ids) {
+        return ResultVO.ok(tencentOrderService.tencentOrderReport(ids));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:tencent:userLogs")
+    @PostMapping("/userLogs")
+    @ApiOperation(value = "腾讯用户回传日志列表")
+    public ResultVO<IPage<GameTencentUserVO>> tencentUserLogList(@RequestBody GameTencentUserDTO dto) {
+        return ResultVO.ok(tencentUserService.tencentUserLogList(dto));
+    }
+
+    @PreAuthorize(permissionKey = "gameBack:tencent:userReport")
+    @PostMapping("/userReport/{ids}")
+    @ApiOperation(value = "腾讯用户手动上报")
+    public ResultVO<Boolean> tencentUserReport(@PathVariable("ids") List<Long> ids) {
+        return ResultVO.ok(tencentUserService.tencentUserReport(ids));
+    }
+}

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

@@ -77,7 +77,5 @@ public class GameBackPolicyVO implements Serializable {
 
     private Long updateBy;
 
-    private String updateName;
-
 
 }

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

@@ -33,4 +33,6 @@ public interface IGameBackPolicyService extends IService<GameBackPolicy> {
     boolean deletePolicy(List<Long> id);
 
     IPage<GameBackPolicyVO> policyList(GameBackPolicyListDTO dto);
+
+    List<GameBackPolicyVO> allOfUser();
 }

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

@@ -24,6 +24,7 @@ import com.zanxiang.game.back.serve.service.IGameTencentBackLogService;
 import com.zanxiang.game.back.serve.service.IGameTencentOrderService;
 import com.zanxiang.game.back.serve.service.IGameTencentUserService;
 import com.zanxiang.game.back.serve.utils.BackPolicyUtil;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.module.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -113,9 +115,9 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .build();
 
         boolean doBack;
-        if (null == dto.getBackPolicyId()){
+        if (null == dto.getBackPolicyId()) {
             doBack = true;
-        }else {
+        } else {
             GameBackPolicy gameBackPolicy = gameBackPolicyService.getById(dto.getBackPolicyId());
 
             doBack = BackPolicyUtil.backOrder(gameBackPolicy, dto.getRechargeMoney(), backUnit -> Long.valueOf(
@@ -159,9 +161,9 @@ public class GameBackPolicyServiceImpl extends ServiceImpl<GameBackPolicyMapper,
                 .eq(GameTencentUser::getGameId, dto.getGameId())
                 .eq(GameTencentUser::getWechatAppId, dto.getWechatAppId())
                 .eq(GameTencentUser::getAdAccountId, dto.getAdAccountId())
-                .eq(GameTencentUser::getIsBack,BackStatusEnum.SUCCESS.getBackStatus())
+                .eq(GameTencentUser::getIsBack, BackStatusEnum.SUCCESS.getBackStatus())
         );
-        if (null == gameTencentUser){
+        if (null == gameTencentUser) {
             //用户保存
             gameTencentUser = GameTencentUser.builder()
                     .adAccountId(dto.getAdAccountId())
@@ -274,23 +276,32 @@ 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(GameBackPolicy::getCreateBy,SecurityUtil.getUserId())
+                        .eq(GameBackPolicy::getCreateBy, SecurityUtil.getUserId())
                         .orderByDesc(GameBackPolicy::getCreateTime))
-                .convert(item -> GameBackPolicyVO.builder()
-                        .id(item.getId())
-                        .backPolicyName(item.getBackPolicyName())
-                        .bigRechargeBackPercentage(item.getBigRechargeBackPercentage())
-                        .bigRechargeMoney(item.getBigRechargeMoney())
-                        .firstRechargeBackPercentage(item.getFirstRechargeBackPercentage())
-                        .firstRechargeMoney(item.getFirstRechargeMoney())
-                        .otherRechargeBackPercentage(item.getOtherRechargeBackPercentage())
-                        .levelDown(item.getLevelDown())
-                        .createTime(item.getCreateTime())
-                        .updateTime(item.getUpdateTime())
-                        .createBy(item.getCreateBy())
-                        .updateBy(item.getUpdateBy())
-                        .createName(sysUserRpc.getById(item.getCreateBy()).getData().getNickname())
-                        .updateName(null == item.getUpdateBy() ? null : sysUserRpc.getById(item.getUpdateBy()).getData().getNickName())
-                        .build());
+                .convert(this::toVO);
+    }
+
+    @Override
+    public List<GameBackPolicyVO> allOfUser() {
+        return list(new LambdaQueryWrapper<GameBackPolicy>()
+                .eq(GameBackPolicy::getCreateBy, SecurityUtil.getUserId())
+                .orderByDesc(GameBackPolicy::getCreateTime)
+        ).stream().map(this::toVOSimple).collect(Collectors.toList());
+    }
+
+    private GameBackPolicyVO toVOSimple(GameBackPolicy gameBackPolicy) {
+        if (gameBackPolicy == null) {
+            return null;
+        }
+        return BeanUtil.copy(gameBackPolicy, GameBackPolicyVO.class);
+    }
+
+    private GameBackPolicyVO toVO(GameBackPolicy gameBackPolicy) {
+        if (gameBackPolicy == null) {
+            return null;
+        }
+        GameBackPolicyVO vo = toVOSimple(gameBackPolicy);
+        vo.setCreateName(sysUserRpc.getById(gameBackPolicy.getCreateBy()).getData().getNickname());
+        return vo;
     }
 }