From 5ceeb44fc2ca8acc8df5321bb5feab27251f5ed3 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 22:55:02 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/modules/MallMemberCollectionMapper.xml             |    2 +-
 src/main/resources/mapper/modules/MallMemberFootprintMapper.xml              |    2 +-
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 0fb793c..97d41e9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -253,14 +253,16 @@
             mallMemberVo.setHasPayment(1);
         }
 
-        LambdaQueryWrapper<MallMemberCollection> collectionQuery = new LambdaQueryWrapper<>();
-        collectionQuery.eq(MallMemberCollection::getMemberId, id);
-        List<MallMemberCollection> collectionList = mallMemberCollectionService.list(collectionQuery);
+        MemberCollectionListDto memberCollectionListDto = new MemberCollectionListDto();
+        memberCollectionListDto.setPageNow(1);
+        memberCollectionListDto.setPageNow(10);
+        List<CollectionListVo> collectionList = mallMemberCollectionService.findMemberCollectionList(memberCollectionListDto);
         mallMemberVo.setCollectionCnt(CollUtil.isNotEmpty(collectionList) ? collectionList.size() : 0);
 
-        LambdaQueryWrapper<MallMemberFootprint> footprintQuery = new LambdaQueryWrapper<>();
-        footprintQuery.eq(MallMemberFootprint::getMemberId, id);
-        List<MallMemberFootprint> footprintList = mallMemberFootprintService.list(footprintQuery);
+        MemberFootprintListDto memberFootprintListDto = new MemberFootprintListDto();
+        memberFootprintListDto.setPageNow(1);
+        memberFootprintListDto.setPageSize(10);
+        List<FootprintListVo> footprintList = mallMemberFootprintService.findMemberFootprintList(memberFootprintListDto);
         mallMemberVo.setFootprintCnt(CollUtil.isNotEmpty(footprintList) ? footprintList.size() : 0);
 
         List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
diff --git a/src/main/resources/mapper/modules/MallMemberCollectionMapper.xml b/src/main/resources/mapper/modules/MallMemberCollectionMapper.xml
index c6c80e1..8f3a7d8 100644
--- a/src/main/resources/mapper/modules/MallMemberCollectionMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCollectionMapper.xml
@@ -10,7 +10,7 @@
              ,goods.present_price
              ,goods.is_sale
         from mall_member_collection collection
-            inner join mall_goods goods on collection.goods_id=goods.ID
+            inner join mall_goods goods on collection.goods_id=goods.ID and goods.is_sales = 1
         <where>
             <if test="record != null">
                 <if test="record.memberId != null">
diff --git a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
index 3890f4f..8a096b9 100644
--- a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
@@ -10,7 +10,7 @@
              ,goods.present_price
              ,goods.is_sale
         from mall_member_footprint footprint
-            inner join mall_goods goods on footprint.goods_id=goods.ID
+            inner join mall_goods goods on footprint.goods_id=goods.ID and goods.is_sales = 1
         <where>
             <if test="record != null">
                 <if test="record.memberId != null">

--
Gitblit v1.9.1