From 657d6ca995fade9e0f23002c54263f1c972a254f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Aug 2023 15:16:33 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 96 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 3efaebe..e8b8d60 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,8 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
+ private final MallAddressInfoMapper mallAddressInfoMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -522,6 +521,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);
}
@@ -597,6 +600,14 @@
MallOrderListVo mallOrderListVo = dappMemberDao.selectMallOrderListVoById(id);
List<MallOrderItemVo> mallOrderItemVoList = dappMemberDao.selectMallOrderItemVoByOrderId(id);
mallOrderListVo.setItems(mallOrderItemVoList);
+ long addressId = ObjectUtil.isEmpty(mallOrderListVo.getAddressId()) ? 0L : mallOrderListVo.getAddressId();
+ MallAddressInfo mallAddressInfo = mallAddressInfoMapper.selectById(addressId);
+ if(ObjectUtil.isNotEmpty(mallAddressInfo)){
+ mallOrderListVo.setName(mallAddressInfo.getName());
+ mallOrderListVo.setPhone(mallAddressInfo.getPhone());
+ mallOrderListVo.setArea(mallAddressInfo.getArea());
+ mallOrderListVo.setAddress(mallAddressInfo.getAddress());
+ }
return mallOrderListVo;
}
@@ -647,6 +658,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 +756,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(),
@@ -877,6 +894,81 @@
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());
+ }
+ }
+ }
+
+ @Override
+ public void createAddress(CreateAddressDto createAddressDto) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ MallAddressInfo mallAddressInfo = new MallAddressInfo();
+ mallAddressInfo.setMemberId(memberId);
+ mallAddressInfo.setName(createAddressDto.getName());
+ mallAddressInfo.setPhone(createAddressDto.getPhone());
+ mallAddressInfo.setArea(createAddressDto.getArea());
+ mallAddressInfo.setAddress(createAddressDto.getAddress());
+ mallAddressInfo.setIsDefault(1);
+ mallAddressInfoMapper.insert(mallAddressInfo);
+ }
+
+ @Override
+ public void delAddress(Long id) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ MallAddressInfo mallAddressInfo = mallAddressInfoMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallAddressInfo)){
+ throw new FebsException("地址不存在");
+ }
+ mallAddressInfo.setIsDefault(2);
+ mallAddressInfoMapper.updateById(mallAddressInfo);
+ }
+
+ @Override
+ public IPage<MallAddressInfo> findAddressList(MallGoodsQueryDto queryDto) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ Page<MallAddressInfo> page = new Page<>(queryDto.getPageNow(), queryDto.getPageSize());
+ return dappMemberDao.selectAddressListInPage(queryDto, page);
+ }
+
+ @Override
+ public MallAddressInfo addressDetails(Long id) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+ MallAddressInfo mallAddressInfo = mallAddressInfoMapper.selectById(id);
+ return mallAddressInfo;
+ }
+
+ @Override
+ public void updateAddress(CreateAddressDto createAddressDto) {
+ Long memberId = LoginUserUtil.getAppUser().getId();
+
+ MallAddressInfo mallAddressInfo = mallAddressInfoMapper.selectById(createAddressDto.getId());
+ if(ObjectUtil.isEmpty(mallAddressInfo)){
+ throw new FebsException("地址不存在");
+ }
+ mallAddressInfo.setName(createAddressDto.getName());
+ mallAddressInfo.setPhone(createAddressDto.getPhone());
+ mallAddressInfo.setArea(createAddressDto.getArea());
+ mallAddressInfo.setAddress(createAddressDto.getAddress());
+ mallAddressInfoMapper.updateById(mallAddressInfo);
+ }
+
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