From 990c09c842d87d1f179e3a0070541da0457b8393 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 21 Nov 2023 14:07:19 +0800
Subject: [PATCH] 匹配
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 11 deletions(-)
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..86b2f8a 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,10 @@
private final MallMemberMapper mallMemberMapper;
private final MallScoreVoucherMapper mallScoreVoucherMapper;
private final IApiMallMemberWalletService memberWalletService;
+ private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
+ private final IApiMallMemberService mallMemberService;
+ private final MallScoreRecordMapper mallScoreRecordMapper;
@Override
public ScoreSignVo scoreSign() {
@@ -109,6 +109,7 @@
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
apiScoreVoucherInfoVo.setVoucherCnt(mallMemberWallet.getVoucherCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherCnt());
apiScoreVoucherInfoVo.setVoucherAmount(mallMemberWallet.getVoucherAmount().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherAmount());
+ apiScoreVoucherInfoVo.setVoucherFireCnt(mallMemberWallet.getVoucherFireCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherFireCnt());
DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
GreenScoreEnum.SCORE_PRICE.getType(),
GreenScoreEnum.SCORE_PRICE.getCode());
@@ -117,6 +118,9 @@
GreenScoreEnum.SCORE_POOL_CNT.getType(),
GreenScoreEnum.SCORE_POOL_CNT.getCode());
apiScoreVoucherInfoVo.setScorePoolCnt(new BigDecimal(scorePoolCntDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN));
+
+ BigDecimal voucherCntSurplus = mallScoreRecordMapper.selectSurplusCntByMemberId(member.getId());
+ apiScoreVoucherInfoVo.setVoucherCntSurplus(voucherCntSurplus);
return apiScoreVoucherInfoVo;
}
@@ -174,7 +178,9 @@
scorePoolCntDic.setValue(scorePoolCnt.toString());
dataDictionaryCustomMapper.updateById(scorePoolCntDic);
//增加凭证数量
- mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
+// mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
+ //增加凭证燃烧值数量
+ mallMemberWalletMapper.addVorCherFireCntByMemberId(voucherCnt,memberId);
//增加购买记录
String voucherNo = MallUtils.getOrderNum("VB");
MallScoreVoucher mallScoreVoucher = new MallScoreVoucher();
@@ -221,7 +227,7 @@
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
BigDecimal voucherCntMember = mallMemberWallet.getVoucherCnt();
if(voucherCntMember.compareTo(voucherCnt) < 0){
- throw new FebsException("绿色积分不足");
+ throw new FebsException("数量不足");
}
DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -258,12 +264,74 @@
voucherAmount,
MoneyFlowTypeEnum.VOUCHER_SALE.getValue(),
voucherNo,
- FlowTypeEnum.VOUCHER_AMOUNT.getValue());
+ FlowTypeEnum.BALANCE.getValue());
return new FebsResponse().success().message("操作成功");
}
@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, "voucherAmount");
+ 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
+ public FebsResponse findMallScoreVoucherListInPage(ApiScoreVoucherRecordDto apiScoreVoucherRecordDto) {
+ IPage<ApiScoreVoucherRecordVo> page = new Page<>(apiScoreVoucherRecordDto.getPageNum(), apiScoreVoucherRecordDto.getPageSize());
+ Long id = LoginUserUtil.getLoginUser().getId();
+ apiScoreVoucherRecordDto.setMemberId(id);
+ IPage<ApiScoreVoucherRecordVo> pages = mallScoreVoucherMapper.findMallScoreVoucherListInPage(page, apiScoreVoucherRecordDto);
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void sign() {
MallMember member = LoginUserUtil.getLoginUser();
--
Gitblit v1.9.1