From c1af5cf94920702b6aa962881365116542e88ab0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 30 Jul 2024 09:42:46 +0800
Subject: [PATCH] 后台
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 57bda50..0022d71 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -254,10 +254,12 @@
}
mallMemberVo.setLevelName(MemberLevelEnum.NORMAL.getLevelDescription(mallMember.getLevel()));
mallMemberVo.setPartner(mallMember.getPartner());
+ mallMemberVo.setDirector(mallMember.getDirector());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
+ mallMemberVo.setEquityLimit(wallet.getEquityLimit());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -400,8 +402,23 @@
if (!loginMember.getTradePassword().equals(SecureUtil.md5(transferDto.getTradePwd()))) {
throw new FebsException("支付密码错误");
}
+ MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ if(wallet.getBalance().compareTo(BigDecimal.ZERO) <= 0){
+ throw new FebsException("金额不足");
+ }
+ if(wallet.getEquityLimit().compareTo(BigDecimal.ZERO) <= 0){
+ throw new FebsException("权益积分不足");
+ }
+ if(transferDto.getAmount().compareTo(wallet.getBalance()) > 0) {
+ throw new FebsException("金额不足");
+ }
+
+ if(transferDto.getAmount().compareTo(wallet.getEquityLimit()) > 0) {
+ throw new FebsException("权益积分不足");
+ }
if(1 == transferDto.getType()){
walletService.reduceBalance(transferDto.getAmount(), memberId);
+ walletService.reduce(transferDto.getAmount(), memberId, "equityLimit");//减少权益积分
String orderNo = MallUtils.getOrderNum("T");
this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
@@ -409,12 +426,13 @@
this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
}
if(2 == transferDto.getType()){
- walletService.reduce(transferDto.getAmount(), memberId, "score");
- String orderNo = MallUtils.getOrderNum("T");
- this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.SCORE.getValue());
-
- walletService.add(transferDto.getAmount(), mallMember.getId(), "score");
- this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.SCORE.getValue());
+ throw new FebsException("暂未开通");
+// walletService.reduce(transferDto.getAmount(), memberId, "score");
+// String orderNo = MallUtils.getOrderNum("T");
+// this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.SCORE.getValue());
+//
+// walletService.add(transferDto.getAmount(), mallMember.getId(), "score");
+// this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.SCORE.getValue());
}
--
Gitblit v1.9.1