From 5d81a2a5f7804b38742bb943b1f9df2ecdc115b5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 24 四月 2019 10:41:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml index 5631d2d..66915f4 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml @@ -50,6 +50,21 @@ </resultMap> + <resultMap id="BaseResultRecordMap" type="com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord"> + <id column="ucr_id" property="id" jdbcType="BIGINT"/> + <result column="ucr_good_id" property="goodId" jdbcType="BIGINT"/> + <result column="ucr_good_source" property="goodSource" jdbcType="VARCHAR"/> + <result column="ucr_coupon_type" property="couponType" jdbcType="VARCHAR"/> + <result column="ucr_order_no" property="orderNo" jdbcType="VARCHAR"/> + <result column="ucr_state" property="state" jdbcType="INTEGER"/> + <result column="ucr_create_time" property="createTime" jdbcType="TIMESTAMP"/> + <result column="ucr_update_time" property="updateTime" jdbcType="TIMESTAMP"/> + + <association property="userSystemCoupon" column="ucr_user_coupon_id" + resultMap="com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper.BaseResultMap"/> + + </resultMap> + <select id="listRebateCoupon" resultMap="BaseResultMap"> SELECT * FROM `yeshi_ec_user_system_coupon` uc LEFT JOIN yeshi_ec_system_coupon p ON p.`sc_id`= uc.`usc_coupon_id` @@ -216,7 +231,7 @@ </if> </select> - <select id="listFreeCouponRecord" resultMap="BaseResultMap"> + <select id="listFreeCouponRecord" resultMap="BaseResultRecordMap"> SELECT * FROM `yeshi_ec_user_system_coupon_record` d LEFT JOIN `yeshi_ec_user_system_coupon` uc ON d.`ucr_user_coupon_id` = uc.`usc_id` LEFT JOIN yeshi_ec_system_coupon p ON p.`sc_id`= uc.`usc_coupon_id` -- Gitblit v1.8.0