BJ_ZTEITS-Developers / parking-cloud-yudao

Commit adff185716a67ee12d38573cb13c381d41cd009b

Authored by puhui999
1 parent 1d597403

【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
  View file @adff185
... ... @@ -13,17 +13,17 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum
13 13 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
14 14 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
15 15 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
16   -import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryRespBO;
17 16 import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageWithdrawSummaryRespBO;
  17 +import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryRespBO;
18 18 import io.swagger.v3.oas.annotations.Operation;
19 19 import io.swagger.v3.oas.annotations.Parameter;
20 20 import io.swagger.v3.oas.annotations.tags.Tag;
  21 +import jakarta.annotation.Resource;
  22 +import jakarta.validation.Valid;
21 23 import org.springframework.security.access.prepost.PreAuthorize;
22 24 import org.springframework.validation.annotation.Validated;
23 25 import org.springframework.web.bind.annotation.*;
24 26  
25   -import jakarta.annotation.Resource;
26   -import jakarta.validation.Valid;
27 27 import java.util.Map;
28 28 import java.util.Set;
29 29  
... ... @@ -110,7 +110,7 @@ public class BrokerageUserController {
110 110 // 合计分佣的提现
111 111 // TODO @疯狂：如果未来支持了打款这个动作，可能 status 会不对；
112 112 Map<Long, BrokerageWithdrawSummaryRespBO> withdrawMap = brokerageWithdrawService.getWithdrawSummaryMapByUserId(
113   - userIds, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS);
  113 + userIds, BrokerageWithdrawStatusEnum.WITHDRAW_SUCCESS);
114 114 // 拼接返回
115 115 return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap,
116 116 brokerageOrderSummaryMap, withdrawMap));
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
  View file @adff185
... ... @@ -84,7 +84,7 @@ public class AppBrokerageUserController {
84 84 BrokerageRecordBizTypeEnum.ORDER, BrokerageRecordStatusEnum.SETTLEMENT, beginTime, endTime);
85 85 // 统计用户提现的佣金
86 86 Integer withdrawPrice = brokerageWithdrawService.getWithdrawSummaryListByUserId(Collections.singleton(userId),
87   - BrokerageWithdrawStatusEnum.AUDIT_SUCCESS).stream()
  87 + BrokerageWithdrawStatusEnum.WITHDRAW_SUCCESS).stream()
88 88 .findFirst().map(BrokerageWithdrawSummaryRespBO::getPrice).orElse(0);
89 89 // 统计分销用户数量（一级）
90 90 Long firstBrokerageUserCount = brokerageUserService.getBrokerageUserCountByBindUserId(userId, 1);
... ...