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

分销等级

This commit is contained in:
张松 2025-10-28 13:34:28 +08:00
parent acd952a8a1
commit f83945f8f5
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,18 +5,15 @@ import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaCheckMainShop; import com.czg.annotation.SaCheckMainShop;
import com.czg.market.dto.MkDistributionConfigDTO; import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.service.MkDistributionAmountFlowService; import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
import com.czg.market.service.MkDistributionConfigService; import com.czg.market.service.*;
import com.czg.market.service.MkDistributionFlowService;
import com.czg.market.service.MkDistributionUserService;
import com.czg.market.vo.*; import com.czg.market.vo.*;
import com.czg.order.dto.MkDistributionPayDTO; import com.czg.order.dto.MkDistributionPayDTO;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.czg.validator.group.UpdateGroup; import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.validation.groups.Default;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -39,6 +36,8 @@ public class DistributionController {
private MkDistributionAmountFlowService distributionAmountFlowService; private MkDistributionAmountFlowService distributionAmountFlowService;
@Resource @Resource
private MkDistributionFlowService distributionFlowService; private MkDistributionFlowService distributionFlowService;
@Resource
private MkDistributionWithdrawFlowService withdrawFlowService;
/** /**
* 配置信息详情 * 配置信息详情
@ -114,6 +113,19 @@ public class DistributionController {
} }
/**
* 用户提现列表
* @param shopUserId 用户id
* @param key 搜索
* @param startTime 开始时间
* @param endTime 结束时间
*/
@GetMapping("/withdrawFlow")
public CzgResult<Page<MkDistributionWithdrawFlowDTO>> withdrawPageInfo(@RequestParam(required = false) Long shopUserId, @RequestParam(required = false) String key,
@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
return CzgResult.success(withdrawFlowService.withdrawPageInfo(StpKit.USER.getShopId(), shopUserId, StrUtil.isBlank(startTime) ? null : DateUtil.parseLocalDateTime(startTime),
StrUtil.isBlank(endTime) ? null : DateUtil.parseLocalDateTime(endTime), key));
}

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionWithdrawFlowService.java
View File

@ -5,6 +5,8 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService; import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkDistributionWithdrawFlow; import com.czg.market.entity.MkDistributionWithdrawFlow;
import java.time.LocalDateTime;
/** /**
* 提现记录表 服务层。 * 提现记录表 服务层。
* *
@ -14,4 +16,6 @@ import com.czg.market.entity.MkDistributionWithdrawFlow;
public interface MkDistributionWithdrawFlowService extends IService<MkDistributionWithdrawFlow> { public interface MkDistributionWithdrawFlowService extends IService<MkDistributionWithdrawFlow> {
Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId); Page<MkDistributionWithdrawFlow> pageInfo(long userId, Long shopId);
Page<MkDistributionWithdrawFlowDTO> withdrawPageInfo(Long shopId, Long shopUserId, LocalDateTime startTime, LocalDateTime endTime, String key);
} }