分佣: 提现

owen
1 parent f72a0870
Showing 6 changed files with 26 additions and 17 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/AppTradeConfigController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/config/vo/AppTradeConfigRespVO.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordService.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.*;
+import cn.iocoder.yudao.module.trade.dal.dataobject.brokerage.BrokerageUserDO;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageRecordBizTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
 import cn.iocoder.yudao.module.trade.service.brokerage.BrokerageRecordService;
@@ -41,15 +42,15 @@ public class AppBrokerageUserController {
     @Resource
     private BrokerageWithdrawService brokerageWithdrawService;
-    // TODO 芋艿：临时 mock =>
     @GetMapping("/get")
     @Operation(summary = "获得个人分销信息")
     @PreAuthenticated
     public CommonResult<AppBrokerageUserRespVO> getBrokerageUser() {
+        Optional<BrokerageUserDO> user = Optional.ofNullable(brokerageUserService.getBrokerageUser(getLoginUserId()));
         AppBrokerageUserRespVO respVO = new AppBrokerageUserRespVO()
-                .setBrokerageEnabled(true)
-                .setBrokeragePrice(2000)
-                .setFrozenPrice(3000);
+                .setBrokerageEnabled(user.map(BrokerageUserDO::getBrokerageEnabled).orElse(false))
+                .setBrokeragePrice(user.map(BrokerageUserDO::getBrokeragePrice).orElse(0))
+                .setFrozenPrice(user.map(BrokerageUserDO::getFrozenPrice).orElse(0));
         return success(respVO);
     }
@@ -43,7 +43,7 @@ public class AppBrokerageWithdrawCreateReqVO {
     @NotBlank(message = "持卡人姓名不能为空", groups = {Bank.class})
     private String name;
     @Schema(description = "提现银行", example = "1")
-    @NotBlank(message = "提现银行不能为空", groups = {Bank.class})
+    @NotNull(message = "提现银行不能为空", groups = {Bank.class})
     private Integer bankName;
     @Schema(description = "开户地址", example = "海淀支行")
     private String bankAddress;
 package cn.iocoder.yudao.module.trade.controller.app.config;
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.trade.controller.app.config.vo.AppTradeConfigRespVO;
+import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
+import cn.iocoder.yudao.module.trade.service.config.TradeConfigService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,8 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static java.util.Arrays.asList;
 @Tag(name = "用户 App - 交易配置")
 @RestController
@@ -20,17 +24,18 @@ import static java.util.Arrays.asList;
 @Validated
 @Slf4j
 public class AppTradeConfigController {
+    @Resource
+    private TradeConfigService tradeConfigService;
     @GetMapping("/get")
     public CommonResult<AppTradeConfigRespVO> getTradeConfig() {
-        AppTradeConfigRespVO respVO = new AppTradeConfigRespVO();
-        respVO.setBrokeragePosterUrls(asList(
-                "https://api.java.crmeb.net/crmebimage/product/2020/08/03/755bf516b1ca4b6db3bfeaa4dd5901cdh71kob20re.jpg",
-                "https://api.java.crmeb.net/crmebimage/maintain/2021/03/01/406d729b84ed4ec9a2171bfcf6fd0634ughzbz9kfi.jpg",
-                "https://api.java.crmeb.net/crmebimage/maintain/2021/03/01/efb1e4e7fe604fe1988b4213ce08cb11tdsyijtd2r.jpg"
-        ));
-        respVO.setBrokerageFrozenDays(10);
-        respVO.setBrokerageWithdrawMinPrice(100);
+        TradeConfigDO tradeConfig = ObjUtil.defaultIfNull(tradeConfigService.getTradeConfig(), new TradeConfigDO());
+
+        AppTradeConfigRespVO respVO = new AppTradeConfigRespVO()
+                .setBrokeragePosterUrls(tradeConfig.getBrokeragePostUrls())
+                .setBrokerageFrozenDays(tradeConfig.getBrokerageFrozenDays())
+                .setBrokerageWithdrawMinPrice(tradeConfig.getBrokerageWithdrawMinPrice())
+                .setBrokerageWithdrawType(tradeConfig.getBrokerageWithdrawType());
         return success(respVO);
     }
@@ -18,4 +18,7 @@ public class AppTradeConfigRespVO {
     @Schema(description = "佣金提现最小金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Integer brokerageWithdrawMinPrice;
+    @Schema(description = "提现方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "[1, 2]")
+    private List<Integer> brokerageWithdrawType;
+
 }
@@ -52,7 +52,7 @@ public interface BrokerageRecordService {
      * @param brokeragePrice 佣金
      * @param title          标题
      */
-    void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, int brokeragePrice, String title);
+    void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, Integer brokeragePrice, String title);
     /**
      * 取消佣金：将佣金记录，状态修改为已失效
@@ -229,12 +229,12 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, int brokeragePrice, String title) {
+    public void addBrokerage(Long userId, BrokerageRecordBizTypeEnum bizType, String bizId, Integer brokeragePrice, String title) {
         // 校验佣金余额
         BrokerageUserDO user = brokerageUserService.getBrokerageUser(userId);
         int balance = Optional.of(user)
                 .map(BrokerageUserDO::getBrokeragePrice).orElse(0);
-        if (balance < brokeragePrice) {
+        if (balance + brokeragePrice < 0) {
             throw exception(BROKERAGE_WITHDRAW_USER_BALANCE_NOT_ENOUGH, new Money(0, balance));
         }