From 5f1941acf9148dedde559f52f6f6b893a27bac84 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 10:43:43 +0800
Subject: [PATCH] 后台修改

---
 src/main/resources/mapper/dapp/DappMemberDao.xml |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 2bd78b9..5cb5078 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -44,8 +44,7 @@
     </select>
 
     <select id="selectAllMemberForInCome" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
-        select * from dapp_member
-        where account_status=1 and source = 1
+        select * from dapp_member where balance > 0
     </select>
 
     <select id="selectAgentMemberList" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
@@ -206,7 +205,7 @@
             a.invite_id inviteId,
             a.address address,
             a.account_type accountType,
-            a.active_status activeStatus,
+            a.active_status activeStatus
         from dapp_member a
         where a.id = #{id}
     </select>
@@ -268,13 +267,21 @@
         a.*
         from mall_goods a
         where a.is_sale = 1
+        <if test="record.categoryId != null and record.categoryId != ''">
+            and a.category_id = #{record.categoryId}
+        </if>
         group by a.id
         order by a.sort_cnt asc
     </select>
 
     <select id="selectMallOrderListQueryInPage" resultType="cc.mrbird.febs.dapp.vo.MallOrderListVo">
-        select a.*
+        select a.*,
+               b.goods_name goodsName,
+               b.goods_id goodsId,
+               b.thumb goodsThumb,
+               b.cnt goodsCnt
         from mall_order_info a
+        left join mall_order_item b on a.id = b.order_id
         <where>
             a.member_id = #{record.memberId}
             <if test="record != null">
@@ -294,9 +301,11 @@
     </select>
 
     <select id="selectMallOrderItemVoByOrderId" resultType="cc.mrbird.febs.dapp.vo.MallOrderItemVo">
-        select a.*
+        select a.*,
+               b.thumb goodsThumb
         from mall_order_item a
-        where orderId = #{orderId}
+        left join mall_goods b on a.goods_id = b.id
+        where order_id = #{orderId}
     </select>
 
     <select id="selectMallGoodsListVoById" resultType="cc.mrbird.febs.dapp.vo.MallGoodsListVo">
@@ -340,4 +349,29 @@
         left join dapp_wallet_mine c on a.id = c.member_id
         where a.id = #{memberId}
     </select>
+
+    <select id="selectAddressListInPage" resultType="cc.mrbird.febs.dapp.entity.MallAddressInfo">
+        select
+            a.*
+        from mall_address_info a
+        where is_default = 1
+        order by a.CREATE_TIME desc
+    </select>
+
+    <select id="selectOrderCntByMemberIdAndStatus" resultType="java.lang.Integer">
+        select count(a.id)
+        from mall_order_info a
+        where a.member_id = #{memberId}
+        and status = #{status}
+    </select>
+
+
+    <select id="selectShopAddressListInPage" resultType="cc.mrbird.febs.dapp.entity.MallAddressInfo">
+        select
+            a.*
+        from mall_address_info a
+        where is_default = 1
+        and a.member_id = #{record.memberId}
+        order by a.CREATE_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1