From f3c83214e7b0eadacf925351d1a9625c44a59bd2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 30 十月 2019 10:31:09 +0800
Subject: [PATCH] 券激活
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
index 380e468..8e4e6c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
@@ -19,7 +19,24 @@
javaType="com.yeshi.fanli.entity.system.SystemCoupon">
<id column="usc_coupon_id" property="id" jdbcType="BIGINT" />
</association>
+ </resultMap>
+
+
+ <resultMap id="AllResultMap" type="com.yeshi.fanli.entity.bus.user.UserSystemCoupon">
+ <id column="usc_id" property="id" jdbcType="BIGINT"/>
+ <result column="usc_uid" property="uid" jdbcType="BIGINT"/>
+ <result column="usc_source" property="source" jdbcType="VARCHAR"/>
+ <result column="usc_give" property="give" jdbcType="VARCHAR"/>
+ <result column="usc_state" property="state" jdbcType="INTEGER"/>
+ <result column="usc_state_activate" property="stateActivated" jdbcType="INTEGER"/>
+ <result column="usc_start_time" property="startTime" jdbcType="TIMESTAMP"/>
+ <result column="usc_end_time" property="endTime" jdbcType="TIMESTAMP"/>
+ <result column="usc_use_time" property="useTime" jdbcType="TIMESTAMP"/>
+ <result column="usc_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="usc_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ <association property="systemCoupon" column="usc_coupon_id"
+ resultMap="com.yeshi.fanli.dao.mybatis.SystemCouponMapper.BaseResultMap"/>
</resultMap>
<resultMap id="ResultVOMap" type="com.yeshi.fanli.vo.user.UserSystemCouponVO">
@@ -222,11 +239,14 @@
WHERE t.usc_uid = #{uid} AND c.`sc_type`= #{type}
</select>
- <select id="getNeedActivateFreeCouponByType" resultMap="BaseResultMap">
+ <select id="getNeedActivateCouponByType" resultMap="AllResultMap">
SELECT * FROM `yeshi_ec_user_system_coupon` t
LEFT JOIN `yeshi_ec_system_coupon` c ON t.`usc_coupon_id` = c.`sc_id`
- WHERE t.usc_uid = #{uid} AND c.`sc_type`= #{type} AND (t.usc_state_activate = 0 OR t.usc_state_activate is null)
+ WHERE t.usc_uid = #{uid} AND c.`sc_type`= #{type} AND t.`usc_state` = 1
+ AND (t.usc_state_activate = 0 OR t.usc_state_activate is null)
+ AND t.`usc_end_time` <![CDATA[>]]> NOW()
ORDER BY usc_id
+ LIMIT 1
</select>
</mapper>
--
Gitblit v1.8.0