From 9252ecbf6ab99182705e0747e30372070ec964af Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 04 Apr 2023 14:25:56 +0800
Subject: [PATCH] 关于积分凭证

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java           |   12 ++++--
 src/main/java/cc/mrbird/febs/common/utils/AppContants.java                     |    1 
 src/main/java/cc/mrbird/febs/mall/service/IScoreService.java                   |    3 +
 src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java           |   68 ++++++++++++++++++++++++++++++----
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java |   11 ++++-
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
index 7e040c6..f33ff3d 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
@@ -69,5 +69,6 @@
     public static final String AGENT_LEVEL_REQUIRE = "AGENT_LEVEL_REQUIRE";
     public static final String MEMBER_WITHDRAW_NORMAL = "普通提现";
     public static final String MEMBER_WITHDRAW_VOUCHER = "凭证提现";
+    public static final String MEMBER_WITHDRAW_VOUCHER_AMOUNT = "凭证现金提现";
 
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java
index 934f99e..515bf43 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiScoreController.java
@@ -1,10 +1,7 @@
 package cc.mrbird.febs.mall.controller;
 
 import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.mall.dto.ApiMallScoreSignRecordDto;
-import cc.mrbird.febs.mall.dto.ApiScoreVoucherRecordDto;
-import cc.mrbird.febs.mall.dto.ApiVoucherBusinessDto;
-import cc.mrbird.febs.mall.dto.OrderListDto;
+import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.service.ICommonService;
 import cc.mrbird.febs.mall.service.IScoreService;
 import cc.mrbird.febs.mall.vo.*;
@@ -90,4 +87,11 @@
         return scoreService.voucherBusinessSale(apiVoucherBusinessDto);
     }
 
+    @ApiOperation(value = "提现")
+    @PostMapping(value = "/withdrawal")
+    public FebsResponse withdrawal(@RequestBody @Validated WithdrawalDto withdrawalDto) {
+        scoreService.withdrawal(withdrawalDto);
+        return new FebsResponse().success().message("提交成功");
+    }
+
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
index f04f1cf..1ceea8d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
@@ -4,6 +4,7 @@
 import cc.mrbird.febs.mall.dto.ApiMallScoreSignRecordDto;
 import cc.mrbird.febs.mall.dto.ApiScoreVoucherRecordDto;
 import cc.mrbird.febs.mall.dto.ApiVoucherBusinessDto;
+import cc.mrbird.febs.mall.dto.WithdrawalDto;
 import cc.mrbird.febs.mall.entity.MallScoreSignRecord;
 import cc.mrbird.febs.mall.vo.ApiMallScoreSignRecordVo;
 import cc.mrbird.febs.mall.vo.ApiScoreVoucherInfoVo;
@@ -29,4 +30,6 @@
     FebsResponse voucherBusinessBuy(ApiVoucherBusinessDto apiVoucherBusinessDto);
 
     FebsResponse voucherBusinessSale(ApiVoucherBusinessDto apiVoucherBusinessDto);
+
+    void withdrawal(WithdrawalDto withdrawalDto);
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index f6248e1..a384839 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -231,12 +231,17 @@
         MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
         mallMoneyFlow.setStatus(3);
         mallMoneyFlowMapper.updateById(mallMoneyFlow);
-
-        //用户佣金增加对应的余额
-        iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+        if(AppContants.MEMBER_WITHDRAW_NORMAL.equals(mallMemberWithdraw.getRemark())){
+            //用户佣金增加对应的余额
+            iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
+        }
         if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){
+            iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance");
             iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucher_cnt");
         }
+        if(AppContants.MEMBER_WITHDRAW_VOUCHER_AMOUNT.equals(mallMemberWithdraw.getRemark())){
+            iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"voucher_amount");
+        }
         return new FebsResponse().success();
     }
 
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 38d7485..c5ef99c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -6,27 +6,23 @@
 import cc.mrbird.febs.common.enumerates.GreenScoreEnum;
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
 import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.AppContants;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.common.utils.MallUtils;
 import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
-import cc.mrbird.febs.mall.dto.ApiMallScoreSignRecordDto;
-import cc.mrbird.febs.mall.dto.ApiScoreVoucherRecordDto;
-import cc.mrbird.febs.mall.dto.ApiVoucherBusinessDto;
-import cc.mrbird.febs.mall.dto.ScoreSettingDto;
+import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.mapper.*;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
 import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
 import cc.mrbird.febs.mall.service.IScoreService;
-import cc.mrbird.febs.mall.vo.ApiMallScoreSignRecordVo;
-import cc.mrbird.febs.mall.vo.ApiScoreVoucherInfoVo;
-import cc.mrbird.febs.mall.vo.ApiScoreVoucherRecordVo;
-import cc.mrbird.febs.mall.vo.ScoreSignVo;
+import cc.mrbird.febs.mall.vo.*;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -59,6 +55,9 @@
     private final MallMemberMapper mallMemberMapper;
     private final MallScoreVoucherMapper mallScoreVoucherMapper;
     private final IApiMallMemberWalletService memberWalletService;
+    private final MallMemberBankMapper mallMemberBankMapper;
+    private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
+    private final IApiMallMemberService mallMemberService;
 
     @Override
     public ScoreSignVo scoreSign() {
@@ -264,6 +263,59 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void withdrawal(WithdrawalDto withdrawalDto) {
+
+        Long memberId = LoginUserUtil.getLoginUser().getId();
+        MallMember mallMember = mallMemberMapper.selectById(memberId);
+        if (StrUtil.isBlank(mallMember.getTradePassword())) {
+            throw new FebsException("未设置支付密码");
+        }
+
+        if (!mallMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) {
+            throw new FebsException("支付密码错误");
+        }
+
+        CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
+        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.CASHOUT_SETTING.getType(), DataDictionaryEnum.CASHOUT_SETTING.getCode());
+        if (dic != null) {
+            cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
+        }
+
+        if (withdrawalDto.getAmount().compareTo(cashOutSettingVo.getMinCashOut()) < 0) {
+            throw new FebsException("最小提现金额为"+cashOutSettingVo.getMinCashOut().setScale(2,BigDecimal.ROUND_DOWN));
+        }
+
+        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
+        if(ObjectUtil.isEmpty(mallMemberBank)){
+            throw new FebsException("未找到银行卡信息");
+        }
+
+        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+        // 可提现
+        BigDecimal canMoney = wallet.getVoucherAmount();
+
+        if(withdrawalDto.getAmount().compareTo(canMoney) > 0) {
+            throw new FebsException("金额不足");
+        }
+
+        walletService.reduce(withdrawalDto.getAmount(), memberId, "voucher_amount");
+        String orderNo = MallUtils.getOrderNum("W");
+
+        MallMemberWithdraw withdraw = new MallMemberWithdraw();
+        withdraw.setWithdrawNo(orderNo);
+        withdraw.setMemberId(memberId);
+        withdraw.setAmount(withdrawalDto.getAmount());
+        withdraw.setStatus(1);
+        withdraw.setAmountFee(BigDecimal.ZERO);
+        withdraw.setRemark(AppContants.MEMBER_WITHDRAW_VOUCHER_AMOUNT);
+        withdraw.setWtihdrawTypeId(mallMemberBank.getId());
+        mallMemberWithdrawMapper.insert(withdraw);
+
+        mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.VOUCHER_AMOUNT.getValue());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void sign() {
         MallMember member = LoginUserUtil.getLoginUser();
 

--
Gitblit v1.9.1