From 5c4d462bbdce5aa68d4b6dc928a62256efe20d2a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 12 Aug 2023 02:02:11 +0800
Subject: [PATCH] 数据修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 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 cdb1fcb..3131500 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)
@@ -149,7 +147,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");
                 }
@@ -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);
     }
 
@@ -611,6 +613,7 @@
     @Transactional
     public Long createOrder(AddOrderDto addOrderDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
+//        DappMemberEntity member = dappMemberDao.selectById(1L);
         /**
          * 1、商品是否上架
          * 2、用户余额是否足够
@@ -662,7 +665,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 +685,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 +741,7 @@
         String payOrderNo = MallUtils.getOrderNum("PAY");
         orderInfo.setPayOrderNo(payOrderNo);
         orderInfo.setPayMethod("余额支付");
-        orderInfo.setPayResult("成功");
+        orderInfo.setPayResult(1);
         orderInfo.setStatus(MallOrderInfo.STATUS_PAY);
         mallOrderInfoMapper.updateById(orderInfo);
         /**
@@ -744,6 +749,7 @@
          */
         dappWalletCoinDao.reduceTotalAndAvailableByMemberId(member.getId(),totalAmount);
         DappFundFlowEntity donateScoreFlow = new DappFundFlowEntity(
+                AccountFlowEnum.AMOUNT.getCode(),
                 member.getId(),
                 totalAmount.negate(),
                 FundFlowEnum.PAY_ORDER.getCode(),
@@ -751,6 +757,7 @@
                 BigDecimal.ZERO,
                 payOrderNo,
                 id);
+        dappFundFlowDao.insert(donateScoreFlow);
 
         /**
          * 支付成功，消费后成有效账户后可分享（有效用户可推广）
@@ -835,7 +842,7 @@
 
         Integer type = mallSystemPayDto.getType();
         if (type == 1) {
-            dappWalletCoinDao.addTotalAndaddAvailableById(memberId,bigDecimal);
+            dappWalletCoinDao.addTotalAndaddAvailableByMemberId(memberId,bigDecimal);
             //插入流水
             DappFundFlowEntity amountFlow = new DappFundFlowEntity(
                     memberId,
@@ -873,6 +880,13 @@
         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