From f321e16eb3b6b6ec0a99ae78d89bdd7ded7ffe91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 12 Aug 2023 22:04:59 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 5b1d7e5..1ee9713 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
@@ -11,10 +11,7 @@
import cc.mrbird.febs.dapp.contract.andao.AndaoContractMain;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
-import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
-import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;
-import cc.mrbird.febs.dapp.enumerate.PoolEnum;
+import cc.mrbird.febs.dapp.enumerate.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.vo.*;
@@ -69,6 +66,7 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -522,6 +520,10 @@
DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(member.getId());
dappMemberInfoVo.setScore(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getTotalAmount());
+ QueryWrapper<MallOrderInfo> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("status", 1);
+ Integer selectCount = mallOrderInfoMapper.selectCount(objectQueryWrapper);
+ dappMemberInfoVo.setWaitPayCnt(selectCount);
return new FebsResponse().success().data(dappMemberInfoVo);
}
@@ -647,6 +649,10 @@
mallOrderInfo.setOrderTime(DateUtil.date());
mallOrderInfo.setAmount(totalAmount);
mallOrderInfo.setStatus(MallOrderInfo.STATUS_WAIT);
+ mallOrderInfo.setDeliverType(addOrderDto.getDeliverType());
+ if(1 == addOrderDto.getDeliverType()){
+ mallOrderInfo.setAddressId(addOrderDto.getAddressId());
+ }
mallOrderInfo.setOrderType(1);
mallOrderInfoMapper.insert(mallOrderInfo);
MallOrderItem mallOrderItem = new MallOrderItem();
@@ -741,12 +747,14 @@
orderInfo.setPayMethod("余额支付");
orderInfo.setPayResult(1);
orderInfo.setStatus(MallOrderInfo.STATUS_PAY);
+ orderInfo.setDeliverState(MallOrderInfo.DELIVER_STATUS_WAIT);
mallOrderInfoMapper.updateById(orderInfo);
/**
* 更新用户余额
*/
dappWalletCoinDao.reduceTotalAndAvailableByMemberId(member.getId(),totalAmount);
DappFundFlowEntity donateScoreFlow = new DappFundFlowEntity(
+ AccountFlowEnum.AMOUNT.getCode(),
member.getId(),
totalAmount.negate(),
FundFlowEnum.PAY_ORDER.getCode(),
@@ -839,7 +847,7 @@
Integer type = mallSystemPayDto.getType();
if (type == 1) {
- dappWalletCoinDao.addTotalAndaddAvailableById(memberId,bigDecimal);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(memberId,bigDecimal);
//插入流水
DappFundFlowEntity amountFlow = new DappFundFlowEntity(
memberId,
@@ -877,6 +885,28 @@
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;
+ }
+
+ @Override
+ public void delOrder(Long id) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+
+ mallOrderInfoMapper.deleteById(id);
+ QueryWrapper<MallOrderItem> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("order_id", id);
+ List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(objectQueryWrapper);
+ if(CollUtil.isNotEmpty(mallOrderItems)){
+ for(MallOrderItem mallOrderItem : mallOrderItems){
+ mallOrderItemMapper.deleteById(mallOrderItem.getId());
+ }
+ }
+ }
+
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