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-08-28 15:44:25 +08:00
parent 4d686b347a
commit fc0236dd9b
10 changed files with 149 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java
View File

@@ -46,13 +46,13 @@ public class CashController {
@ApiImplicitParam(name = "type", value = "提现类型 0粉丝分润 1推广分润 99其他 ", paramType = "type", dataType = "Integer", required = true),
@ApiImplicitParam(name = "status", value = "提现状态 0 申请提现 1 提现成功 2 提现失败", paramType = "status", dataType = "Integer"),
@ApiImplicitParam(name = "merchantCode", value = "商家Code", paramType = "merchantCode", dataType = "String", required = true), })
public Result<PageInfo<Cash>> list(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size, Integer type, Integer status, String merchantCode,
public Result<PageInfo<Cash>> list(@RequestParam(defaultValue = "1") Integer offset,
@RequestParam(defaultValue = "10") Integer pageSize, Integer type, Integer status, String merchantCode,
String userId) {
Map<String, Object> map = new HashMap<>();
map.put("pageSize", size);
map.put("offset", (page - 1) * size);
map.put("pageSize", pageSize);
map.put("offset", (offset - 1) * pageSize);
map.put("status",status);
if (StringUtil.isEmpty(userId)) {
return ResultGenerator.genFailResult("无用户id");
@@ -63,8 +63,8 @@ public class CashController {
List<Cash> cashList = cashService.queryCashPage(map);
Integer count = cashService.queryCashPageCount(map);
// 返回参数
PageInfo<Cash> pageInfo = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size),
page.longValue(), size.longValue(), cashList);
PageInfo<Cash> pageInfo = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, pageSize),
offset.longValue(), pageSize.longValue(), cashList);
return ResultGenerator.genSuccessResult(pageInfo);
}

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

@@ -42,12 +42,10 @@ public class MainPageController {
public Result<?> getSpreadData() {
UserApp userApp = userAppService.queryUserAppByToken();
Map<String, Object> resultMap;
resultMap = promoterMainPageService.getSpreadData(userApp.getUserId() + "");
return ResultGenerator.genSuccessResult(resultMap);
}
@GetMapping("/userApp/modifyFee")
public Result<Object> modifyFee(@RequestParam("id") Integer id, @RequestParam("fee") BigDecimal fee){
UserApp result = userAppService.queryUserBaseInfoByToken();
@@ -74,4 +72,23 @@ public class MainPageController {
return ResultGenerator.genSuccessResult(merchantProfitVOS);
}
/**
* 创客团队管理
* @param name
* @param current
* @param size
* @param typeCode
* @return
*/
@GetMapping("/userApp/teamQuotaControl")
public Result<Object> teamQuotaControl(String name,
@RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam("typeCode") String typeCode){
UserApp result = userAppService.queryUserBaseInfoByToken();
Map<String, Object> merchantProfitVOS = merchantProfitService.teamQuotaList(typeCode, result.getUserId(),
current,size,name);
return ResultGenerator.genSuccessResult(merchantProfitVOS);
}
}