From 6d774fb3fe75aa382947ab373595c59b104a56bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 18:17:38 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 0817960..47de2a9 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
@@ -73,7 +73,7 @@
public FebsResponse register(RegisterDto registerDto) {
MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
if (mallMember != null) {
- throw new FebsException("该账号已被占用");
+ throw new FebsException("001-该账号已被占用");
}
List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
@@ -255,6 +255,15 @@
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
+ //提现冻结金额
+ BigDecimal froBalance = mallMoneyFlowMapper.selectSumAmountByStatusAndMemberId(MallMoneyFlow.STATUS_ING, id);
+ mallMemberVo.setFroBalance(froBalance);
+ //剩余保证金
+ BigDecimal avaAmount = mallMemberStarBuyMapper.selectSumAvaAmountByStatusAndMemberId(1,id);
+ mallMemberVo.setAvaAmount(avaAmount);
+ String accountLevel = mallMemberVo.getAccountLevel();
+ Integer memberLevelCode = MemberAccountLevelEnum.NORMAL.getMemberLevelCode(accountLevel);
+ mallMemberVo.setAccountLevelCode(memberLevelCode);
return new FebsResponse().success().data(mallMemberVo);
}
@@ -385,11 +394,34 @@
}
walletService.reduceBalance(transferDto.getAmount(), memberId);
- String orderNo = MallUtils.getOrderNum("T");
- this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
-
+ String orderNo = MallUtils.getOrderNum("NZ");
+// this.addMoneyFlow(memberId, transferDto.getAmount().negate(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, mallMember.getId(), null, FlowTypeEnum.BALANCE.getValue());
+ //生成流水
+ Long outFlowId = mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ orderNo,
+ transferDto.getAmount().negate(),
+ MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ memberId,
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getName()
+ );
walletService.addBalance(transferDto.getAmount(), mallMember.getId());
- this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
+ //生成流水
+ Long inFlowId = mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ orderNo,
+ transferDto.getAmount(),
+ MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ mallMember.getId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.WITHDRAW_INSIDE.getName()
+ );
+// this.addMoneyFlow(mallMember.getId(), transferDto.getAmount(), MoneyFlowTypeEnum.TRANSFER.getValue(), orderNo, null, null, memberId, null, FlowTypeEnum.BALANCE.getValue());
}
@Override
@@ -611,7 +643,7 @@
cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(value);
String price = jsonObject.get("price").toString();
String status = jsonObject.get("status").toString();
- apiMallMemberStarVo.setPrice(new BigDecimal(price).setScale(BigDecimal.ROUND_DOWN,2));
+ apiMallMemberStarVo.setPrice(new BigDecimal(price).setScale(2,BigDecimal.ROUND_DOWN));
apiMallMemberStarVo.setStatus(Integer.parseInt(status));
apiMallMemberStarVos.add(apiMallMemberStarVo);
}
@@ -664,7 +696,7 @@
if (!SecureUtil.md5(tradePassword).equals(mallMember.getTradePassword())) {
throw new FebsException("支付密码错误");
}
- BigDecimal buyStarPriceBigDecimal = new BigDecimal(buyStarPrice).setScale(BigDecimal.ROUND_DOWN, 2);
+ BigDecimal buyStarPriceBigDecimal = new BigDecimal(buyStarPrice).setScale(2, BigDecimal.ROUND_DOWN);
int reduce = memberWalletService.reduce(buyStarPriceBigDecimal, mallMember.getId(), "balance");
if (reduce == 2) {
throw new FebsException("余额不足");
@@ -672,7 +704,7 @@
//产生用户升级会员等级记录
MallMemberStarBuy mallMemberStarBuy = new MallMemberStarBuy();
mallMemberStarBuy.setMemberId(mallMember.getId());
- mallMemberStarBuy.setBuyCode(MallUtils.getLogisticsNum("s"));
+ mallMemberStarBuy.setBuyCode(MallUtils.getLogisticsNum("MS"));
mallMemberStarBuy.setStarName(buyStarDescription);
mallMemberStarBuy.setStarCode(buyStarCode);
mallMemberStarBuy.setAmount(buyStarPriceBigDecimal);
--
Gitblit v1.9.1