From 904812187f2fb4eafc9071458f3a91d3f7b7748a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 11:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/resources/mapper/lmk/StoreCouponClaimRecordMapper.xml | 52 ++++++++--------------------------------------------
1 files changed, 8 insertions(+), 44 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/StoreCouponClaimRecordMapper.xml b/framework/src/main/resources/mapper/lmk/StoreCouponClaimRecordMapper.xml
index 63b144e..3d21ff9 100644
--- a/framework/src/main/resources/mapper/lmk/StoreCouponClaimRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/StoreCouponClaimRecordMapper.xml
@@ -52,6 +52,7 @@
<result column="store_id" property="storeId"/>
<result column="user_id" property="userId"/>
<result column="coupon_name" property="couponName"/>
+ <result column="claimTime" property="claimTime"/>
</resultMap>
<select id="getPage" resultMap="BaseResultMapByManager">
@@ -73,12 +74,13 @@
lsccr.store_id,
lsccr.user_id,
lsccr.coupon_name,
- lsccr.create_time,
+ lsccr.create_time AS claimTime,
lsccr.coupon_id
FROM
lmk_store_coupon_claim_record lsccr
INNER JOIN
li_member_coupon lmc ON lmc.coupon_id = lsccr.coupon_id
+ AND lmc.member_id = lsccr.user_id
WHERE
lmc.delete_flag = 0
AND lsccr.delete_flag = 0
@@ -100,33 +102,14 @@
</if>
<!-- 5. 鏃堕棿鑼冨洿绛涢�夛細鐢˙ETWEEN鍖归厤start_time鍜宔nd_time锛堥渶鍚屾椂浼犲叆寮�濮嬪拰缁撴潫鏃堕棿锛� -->
<if test="query.startTime != null and query.endTime != null">
- AND lmc.start_time BETWEEN FROM_UNIXTIME(#{query.startTime}/1000)
+ AND lsccr.create_time BETWEEN FROM_UNIXTIME(#{query.startTime}/1000)
AND FROM_UNIXTIME(#{query.endTime}/1000)
</if>
<!-- 6. 鎺掑簭閫昏緫锛堟牴鎹墠绔紶鍏ョ殑sort瀛楁鍜宱rder鎺掑簭鏂瑰悜锛� -->
<if test="query.sort != null and query.sort != '' and query.order != null and query.order != ''">
- ORDER BY
- <choose>
- <!-- li_member_coupon琛ㄥ瓧娈� -->
- <when test="query.sort == 'memberName'">lmc.member_name #{query.order},</when>
- <when test="query.sort == 'price'">lmc.price #{query.order},</when>
- <when test="query.sort == 'startTime'">lmc.start_time #{query.order},</when>
- <when test="query.sort == 'endTime'">lmc.end_time #{query.order},</when>
- <when test="query.sort == 'memberCouponStatus'">lmc.member_coupon_status #{query.order},</when>
- <when test="query.sort == 'getType'">lmc.get_type #{query.order},</when>
-
- <when test="query.sort == 'couponName'">lsccr.coupon_name #{query.order},</when>
- <when test="query.sort == 'storeName'">lsccr.store_name #{query.order},</when>
- <when test="query.sort == 'createTime'">lsccr.create_time #{query.order},</when>
- <!-- 榛樿鎺掑簭 -->
- <otherwise>lsccr.create_time DESC,</otherwise>
- </choose>
- lsccr.create_time DESC <!-- 鍏滃簳鎺掑簭锛岄伩鍏嶈娉曢敊璇� -->
- </if>
- <!-- 鏈紶鎺掑簭鍙傛暟鏃讹紝榛樿鎸夐鍙栨椂闂村�掑簭 -->
- <if test="(query.sort == null or query.sort == '') or (query.order == null or query.order == '')">
ORDER BY lsccr.create_time DESC
</if>
+
</select>
<select id="getExportData" resultMap="BaseResultMapByManager">
@@ -148,7 +131,7 @@
lsccr.store_id,
lsccr.user_id,
lsccr.coupon_name,
- lsccr.create_time,
+ lsccr.create_time AS claimTime,
lsccr.coupon_id
FROM
lmk_store_coupon_claim_record lsccr
@@ -157,6 +140,7 @@
WHERE
lmc.delete_flag = 0
AND lsccr.delete_flag = 0
+ AND lmc.member_id = lsccr.user_id
<!-- 1. 浼氬憳鍚嶇О妯＄硦鏌ヨ锛堝叧鑱攍i_member_coupon琛級 -->
<if test="query.memberName != null and query.memberName != ''">
AND lmc.member_name LIKE CONCAT('%', #{query.memberName}, '%')
@@ -175,31 +159,11 @@
</if>
<!-- 5. 鏃堕棿鑼冨洿绛涢�夛細鐢˙ETWEEN鍖归厤start_time鍜宔nd_time锛堥渶鍚屾椂浼犲叆寮�濮嬪拰缁撴潫鏃堕棿锛� -->
<if test="query.startTime != null and query.endTime != null">
- AND lmc.start_time BETWEEN FROM_UNIXTIME(#{query.startTime}/1000)
+ AND lsccr.create_time BETWEEN FROM_UNIXTIME(#{query.startTime}/1000)
AND FROM_UNIXTIME(#{query.endTime}/1000)
</if>
<!-- 6. 鎺掑簭閫昏緫锛堟牴鎹墠绔紶鍏ョ殑sort瀛楁鍜宱rder鎺掑簭鏂瑰悜锛� -->
<if test="query.sort != null and query.sort != '' and query.order != null and query.order != ''">
- ORDER BY
- <choose>
- <!-- li_member_coupon琛ㄥ瓧娈� -->
- <when test="query.sort == 'memberName'">lmc.member_name #{query.order},</when>
- <when test="query.sort == 'price'">lmc.price #{query.order},</when>
- <when test="query.sort == 'startTime'">lmc.start_time #{query.order},</when>
- <when test="query.sort == 'endTime'">lmc.end_time #{query.order},</when>
- <when test="query.sort == 'memberCouponStatus'">lmc.member_coupon_status #{query.order},</when>
- <when test="query.sort == 'getType'">lmc.get_type #{query.order},</when>
-
- <when test="query.sort == 'couponName'">lsccr.coupon_name #{query.order},</when>
- <when test="query.sort == 'storeName'">lsccr.store_name #{query.order},</when>
- <when test="query.sort == 'createTime'">lsccr.create_time #{query.order},</when>
- <!-- 榛樿鎺掑簭 -->
- <otherwise>lsccr.create_time DESC,</otherwise>
- </choose>
- lsccr.create_time DESC <!-- 鍏滃簳鎺掑簭锛岄伩鍏嶈娉曢敊璇� -->
- </if>
- <!-- 鏈紶鎺掑簭鍙傛暟鏃讹紝榛樿鎸夐鍙栨椂闂村�掑簭 -->
- <if test="(query.sort == null or query.sort == '') or (query.order == null or query.order == '')">
ORDER BY lsccr.create_time DESC
</if>
</select>
--
Gitblit v1.8.0