From f8c253e532fcf9f76e02e5e0ede6b4300af44929 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 23 Oct 2025 09:55:19 +0800
Subject: [PATCH] fix(aiApply): 更新权限控制标识 - 将同意、拒绝、解绑按钮的权限标识从 companyList:info 更改为 applyList:view - 确保操作按钮权限控制与实际功能匹配 - 修复因权限标识不一致导致的功能不可用问题

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index d86f715..ecde786 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -5,10 +5,11 @@
     <select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
         select
         a.*,
-               b.cost_amount costAmount,
-               b.real_amount realAmount
+        b.cost_amount costAmount,
+        b.real_amount realAmount,
+        b.type type
         from mall_member_coupon a
-        left join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
         <where>
             a.member_id=#{record.memberId}
             <if test="record.state == 1">
@@ -25,6 +26,25 @@
                 and a.goods_id=#{record.goodsId}
             </if>
         </where>
+        order by a.CREATED_TIME desc
+    </select>
+
+    <select id="selectListCreateInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
+        select
+        a.*,
+        b.cost_amount costAmount,
+        b.type type,
+        b.real_amount realAmount
+        from mall_member_coupon a
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        where
+            a.member_id=#{record.memberId}
+                and a.state=#{record.state}
+                and a.expire_time &gt;= #{record.expireTime}
+        and a.coupon_id in
+        <foreach collection = "list" item = "item"  separator=","  open = "(" close = ")" >
+            #{item}
+        </foreach >
         order by a.CREATED_TIME desc
     </select>
 
@@ -56,4 +76,13 @@
         and a.state = 1
     </select>
 
+    <select id="selectListByMemberIdCouponIdWithOutInviteId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.member_id = #{memberId}
+        and a.coupon_id = #{couponId}
+        and a.state = 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1