From 163ee7c4bd868557fb7d7399feaa03d6d9660526 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 17:46:17 +0800
Subject: [PATCH] 数据修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 689b667..5cbd84c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -69,6 +69,7 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -149,7 +150,7 @@
int nodeType = 0;
//
if (!"asdf4321".equals(connectDto.getInviteId())) {
- DappMemberEntity parent = dappMemberDao.selectByAddress(connectDto.getInviteId(), null);
+ DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
if (parent == null) {
throw new FebsException("recommender is not exist");
}
@@ -555,7 +556,7 @@
if(ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- dappMemberEntity.setActiveStatus(1);
+ dappMemberEntity.setActiveStatus(2);
dappMemberDao.updateById(dappMemberEntity);
return new FebsResponse().success();
}
@@ -611,6 +612,7 @@
@Transactional
public Long createOrder(AddOrderDto addOrderDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappMemberEntity member = dappMemberDao.selectById(1L);
/**
* 1、商品是否上架
* 2、用户余额是否足够
@@ -662,7 +664,8 @@
@Override
@Transactional
public void cancelOrder(Long id) {
- DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMemberEntity member = dappMemberDao.selectById(1L);
MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(id);
if (ObjectUtil.isEmpty(orderInfo)) {
throw new FebsException("订单异常");
@@ -681,6 +684,7 @@
@Transactional
public void payOrder(Long id) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappMemberEntity member = dappMemberDao.selectById(1L);
MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(id);
if (ObjectUtil.isEmpty(orderInfo)) {
throw new FebsException("订单异常");
@@ -736,7 +740,7 @@
String payOrderNo = MallUtils.getOrderNum("PAY");
orderInfo.setPayOrderNo(payOrderNo);
orderInfo.setPayMethod("余额支付");
- orderInfo.setPayResult("成功");
+ orderInfo.setPayResult(1);
orderInfo.setStatus(MallOrderInfo.STATUS_PAY);
mallOrderInfoMapper.updateById(orderInfo);
/**
@@ -751,6 +755,7 @@
BigDecimal.ZERO,
payOrderNo,
id);
+ dappFundFlowDao.insert(donateScoreFlow);
/**
* 支付成功，消费后成有效账户后可分享（有效用户可推广）
@@ -823,6 +828,63 @@
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse updateSystemPay(MallSystemPayDto mallSystemPayDto) {
+ Long memberId = mallSystemPayDto.getId();
+ DappMemberEntity mallMember = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+
+ BigDecimal bigDecimal = mallSystemPayDto.getAddBalance();
+
+ Integer type = mallSystemPayDto.getType();
+ if (type == 1) {
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(memberId,bigDecimal);
+ //插入流水
+ DappFundFlowEntity amountFlow = new DappFundFlowEntity(
+ memberId,
+ bigDecimal,
+ FundFlowEnum.SYSTEM_AMOUNT.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ BigDecimal.ZERO);
+ dappFundFlowDao.insert(amountFlow);
+ } else if (type == 2) {
+ dappWalletMineDao.addTotalAndaddAvailableById(bigDecimal,memberId);
+ //插入流水
+ DappFundFlowEntity amountFlow = new DappFundFlowEntity(
+ memberId,
+ bigDecimal,
+ FundFlowEnum.SYSTEM_SCORE.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ BigDecimal.ZERO);
+ dappFundFlowDao.insert(amountFlow);
+ } else if (type == 3) {
+ BigDecimal balance = mallMember.getBalance();
+ balance = balance.add(bigDecimal);
+ mallMember.setBalance(balance);
+ dappMemberDao.updateById(mallMember);
+ //插入流水
+ DappFundFlowEntity amountFlow = new DappFundFlowEntity(
+ memberId,
+ bigDecimal,
+ FundFlowEnum.SYSTEM_PACKAGE.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ BigDecimal.ZERO);
+ dappFundFlowDao.insert(amountFlow);
+ } else {
+ throw new FebsException("参数错误");
+ }
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<MemberMoneyFlowVo> memberMoneyFlow(QueryRequest request, DappMemberEntity dappMemberEntity) {
+ Page<MemberMoneyFlowVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberMoneyFlowVo> memberMoneyFlowVos = dappAccountMoneyChangeDao.selectMemberMoneyFlowInPage(page, dappMemberEntity);
+ return memberMoneyFlowVos;
+ }
+
public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
List<List<String>> partitionedList = new ArrayList<>();
int size = originalList.size();
--
Gitblit v1.9.1