From 867d1b68fcdf6c9a072d3a516368333ad59f2e00 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 18 十二月 2024 08:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/resources/mapping/TCouponReceiveMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/applet/src/main/resources/mapping/TCouponReceiveMapper.xml b/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
index 9e2b92f..e026d56 100644
--- a/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
+++ b/applet/src/main/resources/mapping/TCouponReceiveMapper.xml
@@ -22,7 +22,20 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, couponId, userId, type, amount, storeId, endTime, amountCondition, status, createTime, updateTime, createBy, updateBy, isDelete
+ id, couponId, userId, `type`, amount, storeId, endTime, amountCondition, status, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.jilongda.applet.vo.TCouponReceiveVO">
+ select tcr.id, tcr.couponId, tcr.userId, tcr.`type`, tcr.amount, tcr.storeId, tcr.endTime, tcr.amountCondition, tcr.status,
+ tcr.createTime, tcr.updateTime, tcr.createBy, tcr.updateBy, tcr.isDelete,tc.name as couponName
+ from t_coupon_receive tcr
+ left join t_coupon tc on tc.id = tcr.couponId
+ <where>
+ <if test="query.userId != null">
+ and tcr.userId = #{query.userId}
+ </if>
+ AND tcr.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tcr.status ASC,tcr.createTime DESC
+ </select>
</mapper>
--
Gitblit v1.7.1