From 248ad2bb951e5f12db17db83f516c028dd433e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Fri, 11 Oct 2024 09:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActiveRecommendRecordsServiceImpl.java |  4 +++-
 .../service/impl/UserBalanceServiceImpl.java    | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java
index 37dbbd862..1464da02e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java
@@ -325,7 +325,8 @@ public class ActiveRecommendRecordsServiceImpl extends ServiceImpl<ActiveRecomme
                 if (!"0".equals(activeUserRecharge.getFrequencyLimit())) {
                     //查询推荐人的领取次数
                     Integer count = activeUserRechargeRecordsMapper.selectCount(new LambdaQueryWrapper<ActiveUserRechargeRecords>()
-                            .eq(ActiveUserRechargeRecords::getUserId, activeRecommendRecords.getUserId()));
+                            .eq(ActiveUserRechargeRecords::getUserId, activeRecommendRecords.getUserId())
+                            .eq(ActiveUserRechargeRecords::getStoreId, storeId));
                     if (count >= activeUserRecharge.getFrequencyLimit()) {
                         return;
                     }
@@ -359,6 +360,7 @@ public class ActiveRecommendRecordsServiceImpl extends ServiceImpl<ActiveRecomme
                             //查询优惠券详细信息
                             CardCoupon cardCoupon = cardCouponMapper.selectById(vouchersId);
                             Integer validityDay = 0;
+                            //优惠券的有效期
                             Date effectiveDateStart = new Date();
                             Date effectiveDateEnd = new Date();
                             if (cardCoupon.getTimeType().equals("1")) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
index 3fd854854..10800cc8a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.generator.config.IFileCreate;
+import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser;
+import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapper;
 import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
 import com.fuint.business.marketingActivity.cardFavorable.mapper.CardFavorableRecordMapper;
 import com.fuint.business.marketingActivity.cardGift.entity.CardGift;
@@ -104,6 +106,8 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
     private GrowthValueChangeMapper growthValueChangeMapper;
     @Autowired
     private MtUserGradeMapper mtUserGradeMapper;
+    @Autowired
+    private CardCouponUserMapper cardCouponUserMapper;
 
 
 
@@ -469,10 +473,15 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
             Double giveAmount = ObjectUtil.isNotEmpty(balance.getGiveAmount()) ? balance.getGiveAmount() : 0;
             userBlanceUniVo.setAllBalance(balance.getCardBalance() + giveAmount);
             //查询优惠券数量
-            Integer count = cardFavorableRecordMapper.selectCount(new LambdaQueryWrapper<CardFavorableRecord>()
-                    .eq(CardFavorableRecord::getMtUserId, nowAccountInfo.getId())
-                    .eq(CardFavorableRecord::getStatus, 0)
-                    .eq(CardFavorableRecord::getStoreId, balance.getStoreId()));
+            //新表
+            Integer count = cardCouponUserMapper.selectCount(new LambdaQueryWrapper<CardCouponUser>()
+                    .eq(CardCouponUser::getMtUserId, nowAccountInfo.getId())
+                    .eq(CardCouponUser::getStoreId, balance.getStoreId())
+                    .eq(CardCouponUser::getStatus, "0"));
+//            Integer count = cardFavorableRecordMapper.selectCount(new LambdaQueryWrapper<CardFavorableRecord>()
+//                    .eq(CardFavorableRecord::getMtUserId, nowAccountInfo.getId())
+//                    .eq(CardFavorableRecord::getStatus, "0")
+//                    .eq(CardFavorableRecord::getStoreId, balance.getStoreId()));
             userBlanceUniVo.setCardFavorableCount(count);
             //查询礼品卡已兑换数量和金额
             List<CardGift> cardGifts = cardGiftMapper.selectList(new LambdaQueryWrapper<CardGift>()