From c3ed9a07b0765834136afb6400d350d895584b51 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 01 Jul 2024 14:03:23 +0800
Subject: [PATCH] 后台

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   71 +++++++++++++++++++++++++++--------
 1 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 9259596..e19d1dd 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -390,7 +390,7 @@
     </select>
 
     <select id="selectAchieveBuyByMemberId" resultType="java.math.BigDecimal">
-        select sum(IFNULL(a.nft_total, 0))
+        select IFNULL(sum(IFNULL(a.nft_total, 0)), 0)
         from mall_product_buy a
              inner join mall_member b on a.member_id=b.ID
         where a.state = 3
@@ -403,7 +403,7 @@
     </select>
 
     <select id="selectAchieveSellByMemberId" resultType="java.math.BigDecimal">
-        select sum(IFNULL(a.nft_total, 0))
+        select IFNULL(sum(IFNULL(a.nft_total, 0)), 0)
         from mall_product_sell a
              inner join mall_member b on a.member_id=b.ID
         where a.state = 3
@@ -415,7 +415,7 @@
         </if>
     </select>
 
-    <select id="selectAchieveBuyOrderCntByMemberId" resultType="java.lang.Integer ">
+    <select id="selectAchieveBuyOrderCntByMemberId" resultType="java.lang.Integer">
         select count(a.id)
         from mall_product_buy a
              inner join mall_member b on a.member_id=b.ID
@@ -424,7 +424,7 @@
             and find_in_set(#{inviteId}, b.referrer_ids)
     </select>
 
-    <select id="selectAchieveSellOrderCntByMemberId" resultType="java.lang.Integer ">
+    <select id="selectAchieveSellOrderCntByMemberId" resultType="java.lang.Integer">
         select count(a.id)
         from mall_product_sell a
              inner join mall_member b on a.member_id=b.ID
@@ -464,6 +464,12 @@
     <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
         select * from mall_member
         where level=#{level}
+    </select>
+
+    <select id="selectMemberWithLevelAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where level=#{level}
+        and find_in_set(#{inviteId}, referrer_ids)
     </select>
 
     <select id="selectMemberIdWithLevel" resultType="java.lang.Long">
@@ -531,19 +537,11 @@
     <select id="getFcmMallMemberList" resultType="cc.mrbird.febs.mall.vo.AdminMallMemberVo">
         SELECT
         m.*,
-               b.static_nft staticNft,
-               b.trends_nft trendsNft,
-               b.frozen_nft frozenNft,
-               b.fcm_cnt_ava fcmCntAva,
-               b.fcm_cnt_frozen fcmCntFrozen,
-               b.token_ava tokenAva,
-               b.token_frozen tokenFrozen,
-        a.account_login referrerName,
-        d.description levelName
+               b.balance balance,
+        a.account_login referrerName
         FROM mall_member m
         left join mall_member a on m.referrer_id = a.invite_id
-        left join mall_member_amount b on b.member_id = m.id
-        LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL_REQUIRE'
+        left join mall_member_wallet b on b.member_id = m.id
         <where>
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
@@ -576,7 +574,48 @@
 
     <select id="getMallmemberAmountByMemberId" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
         SELECT a.*
-        FROM mall_member_amount a
+        FROM mall_member_wallet a
         where a.member_id = #{memberId}
     </select>
+
+    <select id="getMemberChargeListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberCharge">
+        select
+               a.*,
+               b.account_login accountLogin
+        from mall_member_charge a
+        left join mall_member b on a.member_id = b.id
+        <where>
+            <if test="record.accountLogin!=null and record.accountLogin!=''">
+                and b.account_login like concat('%',  #{record.accountLogin},'%')
+            </if>
+            <if test="record.address!=null and record.address!=''">
+                and a.address like concat('%',  #{record.address},'%')
+            </if>
+            <if test="record.status!=null">
+                and a.state = #{record.status}
+            </if>
+        </where>
+        order by a.CREATED_TIME desc
+    </select>
+
+    <select id="getMemberWithDrawListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberWithdraw">
+        select
+               a.*,
+               (a.amount + a.amount_fee) as amountReal,
+               b.account_login accountLogin
+        from mall_member_withdraw a
+        left join mall_member b on a.member_id = b.id
+        <where>
+            <if test="record.accountLogin!=null and record.accountLogin!=''">
+                and b.account_login like concat('%',  #{record.accountLogin},'%')
+            </if>
+            <if test="record.address!=null and record.address!=''">
+                and a.remark like concat('%',  #{record.address},'%')
+            </if>
+            <if test="record.status!=null">
+                and a.status = #{record.status}
+            </if>
+        </where>
+        order by a.CREATED_TIME desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1