czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

推广部分最后修改

Browse Source
This commit is contained in:
liuyingfang
2023-07-27 09:53:50 +08:00
parent 817223d79f
commit 9e5aca8d74
10 changed files with 260 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-api-page/src/main/java/cn/pluss/platform/controller/MainPageController.java
View File

@@ -58,7 +58,7 @@ public class MainPageController {
/**
* 团队管理
* @param name
* @param page
* @param current
* @param size
* @param typeCode
* @return

6
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantProfitController.java
View File

@@ -258,14 +258,14 @@ public class MerchantProfitController {
@GetMapping("/profitOrderList")
public Result<List<ProfitOrderVO>> ProfitOrderList(@RequestParam Integer type, @RequestParam Integer page,
@RequestParam Integer size){
@RequestParam Integer size, String startTime, String endTime){
UserApp userApp = userAppService.queryUserAppByToken();
Integer pageSize = size;
Integer offset = (page-1) * size;
if (type == 1) {
return ResultGenerator.genSuccessResult(merchantProfitMapper.directlyOrder(userApp.getUserId(), pageSize, offset));
return ResultGenerator.genSuccessResult(merchantProfitMapper.directlyOrder(userApp.getUserId(), pageSize, offset, startTime, endTime));
}
return ResultGenerator.genSuccessResult(merchantProfitMapper.teamOrder(userApp.getUserId(), pageSize, offset));
return ResultGenerator.genSuccessResult(merchantProfitMapper.teamOrder(userApp.getUserId(), pageSize, offset, startTime, endTime));
}
}