From 4196b93e01b92cded16ffa7a634b0ac30a9b2c6b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 07 Dec 2023 14:55:12 +0800
Subject: [PATCH] 用户留言

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 4578086..3f4d33c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -1129,8 +1129,8 @@
         BigDecimal divide = fcmDestoryCntAdd.divide(AppContants.FCM_BASIC, 0, BigDecimal.ROUND_DOWN);
         if(BigDecimal.ZERO.compareTo(divide) == 0){
             commonService.updateDataDic(
-                    DataDictionaryEnum.BANK_TRANS_URL.getType(),
-                    DataDictionaryEnum.BANK_TRANS_URL.getCode(),
+                    DataDictionaryEnum.FCM_DESTORY_CNT.getType(),
+                    DataDictionaryEnum.FCM_DESTORY_CNT.getCode(),
                     fcmDestoryCntAdd.toString());
         }
 
@@ -1200,32 +1200,29 @@
 
         //已完成的买单
         List<MallProductSellRecord> mallProductSellRecords = mallProductSellRecordMapper.selectListBySellId(sellId,ProductEnum.PRODUCT_MATE_STATE_FINISH.getValue());
-        if(CollUtil.isEmpty(mallProductSellRecords)){
-            return;
+        if(CollUtil.isNotEmpty(mallProductSellRecords)){
+            //实际支付总数
+            BigDecimal nftCntTotal = mallProductSellRecords.stream().map(MallProductSellRecord::getNftCnt).reduce(BigDecimal.ZERO, BigDecimal::add);
+            MallProductSell mallProductSell = mallProductSellMapper.selectById(sellId);
+            if(nftCntTotal.compareTo(mallProductSell.getNftCnt()) >= 0){
+                mallProductSell.setState(ProductEnum.PRODUCT_SELL_SUCCESS.getValue());
+                mallProductSellMapper.updateById(mallProductSell);
+            }
         }
-        //实际支付总数
-        BigDecimal nftCntTotal = mallProductSellRecords.stream().map(MallProductSellRecord::getNftCnt).reduce(BigDecimal.ZERO, BigDecimal::add);
-        MallProductSell mallProductSell = mallProductSellMapper.selectById(sellId);
-        if(nftCntTotal.compareTo(mallProductSell.getNftCnt()) < 0){
-            return;
-        }
-        mallProductSell.setState(ProductEnum.PRODUCT_SELL_SUCCESS.getValue());
-        mallProductSellMapper.updateById(mallProductSell);
+
 
         Long buyId = mallProductBuyRecord.getBuyId();
         List<MallProductBuyRecord> mallProductBuyRecords = mallProductBuyRecordMapper.selectListByBuyId(buyId,ProductEnum.PRODUCT_MATE_STATE_FINISH.getValue());
-        if(CollUtil.isEmpty(mallProductBuyRecords)){
-            return;
+        if(CollUtil.isNotEmpty(mallProductBuyRecords)){
+            //实际支付总数
+            BigDecimal nftCntTotalBuy = mallProductBuyRecords.stream().map(MallProductBuyRecord::getPickNftCnt).reduce(BigDecimal.ZERO, BigDecimal::add);
+            MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(buyId);
+            if(nftCntTotalBuy.compareTo(mallProductBuy.getNftTotal()) >= 0){
+                mallProductBuy.setState(ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
+                mallProductBuy.setPayTime(DateUtil.date());
+                mallProductBuyMapper.updateById(mallProductBuy);
+            }
         }
-        //实际支付总数
-        BigDecimal nftCntTotalBuy = mallProductBuyRecords.stream().map(MallProductBuyRecord::getPickNftCnt).reduce(BigDecimal.ZERO, BigDecimal::add);
-        MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(buyId);
-        if(nftCntTotalBuy.compareTo(mallProductBuy.getNftTotal()) < 0){
-            return;
-        }
-        mallProductBuy.setState(ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
-        mallProductBuy.setPayTime(DateUtil.date());
-        mallProductBuyMapper.updateById(mallProductBuy);
     }
 
     @Override
@@ -1242,6 +1239,10 @@
         MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(mallProductBuyRecord.getBuyId());
         mallProductBuy.setNftAva(mallProductBuy.getNftAva().add(mallProductBuyRecord.getPickNftCnt()));
         mallProductBuyMapper.updateById(mallProductBuy);
+        Long memberId = mallProductBuy.getMemberId();
+        MallMember mallMember = mallMemberMapper.selectById(memberId);
+        mallMember.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
+        mallMemberMapper.updateById(mallMember);
         //更新卖单子表的数据
         MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(sellRecordId);
         mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue());

--
Gitblit v1.9.1