|
@@ -13,17 +13,17 @@ import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum
|
|
|
import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
|
|
|
import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageUserService;
|
|
|
import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageWithdrawService;
|
|
|
-import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryRespBO;
|
|
|
import cn.iocoder.yudao.module.trade.service.brokerage.bo.BrokerageWithdrawSummaryRespBO;
|
|
|
+import cn.iocoder.yudao.module.trade.service.brokerage.bo.UserBrokerageSummaryRespBO;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
+import jakarta.annotation.Resource;
|
|
|
+import jakarta.validation.Valid;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import jakarta.annotation.Resource;
|
|
|
-import jakarta.validation.Valid;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
@@ -110,7 +110,7 @@ public class BrokerageUserController {
|
|
|
// 合计分佣的提现
|
|
|
// TODO @疯狂:如果未来支持了打款这个动作,可能 status 会不对;
|
|
|
Map<Long, BrokerageWithdrawSummaryRespBO> withdrawMap = brokerageWithdrawService.getWithdrawSummaryMapByUserId(
|
|
|
- userIds, BrokerageWithdrawStatusEnum.AUDIT_SUCCESS);
|
|
|
+ userIds, BrokerageWithdrawStatusEnum.WITHDRAW_SUCCESS);
|
|
|
// 拼接返回
|
|
|
return success(BrokerageUserConvert.INSTANCE.convertPage(pageResult, userMap, brokerageUserCountMap,
|
|
|
brokerageOrderSummaryMap, withdrawMap));
|