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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/AccountAgentDayController.java

@@ -10,32 +10,36 @@ import com.zanxiang.game.data.serve.pojo.vo.GamePromoteTotalVO;
 import com.zanxiang.game.data.serve.service.IAccountAgentDayService;
 import com.zanxiang.game.data.serve.utils.Page;
 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+@Api(tags = "推广数据")
 @RestController
 @RequestMapping("/promote")
 public class AccountAgentDayController {
     @Autowired
     private IAccountAgentDayService accountAgentDayService;
 
+    @ApiOperation(value = "推广每日数据")
     @PreAuthorize(permissionKey = "gameData:accountAgent:day")
-    @GetMapping("/day")
-    public ResultVO<Page<GamePromoteDayVO>> accountAgentDay(GamePromoteDayDTO dto) {
+    @PostMapping("/day")
+    public ResultVO<Page<GamePromoteDayVO>> accountAgentDay(@RequestBody GamePromoteDayDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDay(dto));
     }
 
+    @ApiOperation(value = "推广每日数据总计")
     @PreAuthorize(permissionKey = "gameData:accountAgent:dayTotal")
-    @GetMapping("/day/total")
-    public ResultVO<GamePromoteDayTotalVO> accountAgentDayTotal(GamePromoteDayTotalDTO dto) {
+    @PostMapping("/day/total")
+    public ResultVO<GamePromoteDayTotalVO> accountAgentDayTotal(@RequestBody GamePromoteDayTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentDayTotal(dto));
     }
 
+    @ApiOperation(value = "推广总数据")
     @PreAuthorize(permissionKey = "gameData:accountAgent:total")
-    @GetMapping("/total")
-    public ResultVO<Page<GamePromoteTotalVO>> accountAgentTotal(GamePromoteTotalDTO dto) {
+    @PostMapping("/total")
+    public ResultVO<Page<GamePromoteTotalVO>> accountAgentTotal(@RequestBody GamePromoteTotalDTO dto) {
         return ResultVO.ok(accountAgentDayService.accountAgentTotal(dto));
     }
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AccountAgentDayServiceImpl.java

@@ -61,7 +61,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (null != dto.getSysUserId()) {
             cri.where().andEquals("pitcher_id", dto.getSysUserId());
         }
-        if (null != dto.getAccountId()) {
+        if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("account_id", dto.getAccountId());
         }
         if (null != dto.getAgentId()) {
@@ -102,7 +102,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (null != dto.getSysUserId()) {
             cri.where().andEquals("pitcher_id", dto.getSysUserId());
         }
-        if (null != dto.getAccountId()) {
+        if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("account_id", dto.getAccountId());
         }
         if (null != dto.getAgentId()) {
@@ -152,7 +152,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         if (null != dto.getSysUserId()) {
             cri.where().andEquals("a.pitcher_id", dto.getSysUserId());
         }
-        if (null != dto.getAccountId()) {
+        if (StringUtils.isNotBlank(dto.getAccountId())) {
             cri.where().andEquals("a.account_id", dto.getAccountId());
         }
         if (null != dto.getAgentId()) {