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

分校明细

Browse Source
This commit is contained in:
张松
2025-10-27 18:16:38 +08:00
parent 827cc937e1
commit 58f9622656
10 changed files with 176 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
View File

@@ -1,10 +1,13 @@
package com.czg.controller.admin;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaCheckMainShop;
import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.service.MkDistributionAmountFlowService;
import com.czg.market.service.MkDistributionConfigService;
import com.czg.market.service.MkDistributionFlowService;
import com.czg.market.service.MkDistributionUserService;
import com.czg.market.vo.*;
import com.czg.order.dto.MkDistributionPayDTO;
@@ -34,6 +37,8 @@ public class DistributionController {
private MkDistributionUserService distributionUserService;
@Resource
private MkDistributionAmountFlowService distributionAmountFlowService;
@Resource
private MkDistributionFlowService distributionFlowService;
/**
* 配置信息详情
@@ -80,6 +85,37 @@ public class DistributionController {
return CzgResult.success(distributionAmountFlowService.pageInfo(StpKit.USER.getShopId(), type, key));
}
/**
* 开通记录
* @param startTime 开始时间
* @param endTime 结束时间
* @param key 用户id昵称
*/
@GetMapping("openFlow")
public CzgResult<Map<String, Object>> openFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String key) {
return CzgResult.success(distributionAmountFlowService.openPageInfo(StpKit.USER.getShopId(),
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key));
}
/**
* 分销明细
* @param startTime 开始时间
* @param endTime 结束时间
* @param key 用户id昵称
* @param status pending待入账 success已入账
*/
@GetMapping("distributionFlow")
public CzgResult<Map<String, Object>> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime,
@RequestParam(required = false) String key, @RequestParam(required = false) String status) {
return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(),
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status));
}
}