@@ -465,7 +465,11 @@
<resultMap id="CUserResultMap" type="com.simple.domain.vo.WxCouponCVo">
<resultMap id="CUserResultMap" type="com.simple.domain.vo.WxCouponCVo">
<id column="id" jdbcType="BIGINT" property="id" />
<id column="id" jdbcType="BIGINT" property="id" />
<result column="coupon_channel_id" jdbcType="VARCHAR" property="couponChannelId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="type" jdbcType="INTEGER" property="type" />
@@ -491,9 +495,6 @@
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="business" jdbcType="VARCHAR" property="business" />
<result column="business" jdbcType="VARCHAR" property="business" />
<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl" />
<result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl" />
<result column="name" jdbcType="VARCHAR" property="merchantName" />
<result column="name" jdbcType="VARCHAR" property="merchantName" />
<result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" />
<result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" />
@@ -508,11 +509,11 @@
</resultMap>
</resultMap>
<sql id="allCUserColumns">
<sql id="allCUserColumns">
c.id,cc.id as counpon_channel_id,c. tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business,
c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business,
m.img_url,m.name,m.link_phone,m.status,
m.img_url,m.name,m.link_phone,m.status,
s.addr,s.shop_number,s.baidu_poi,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name,
mb.building_name,mf.floor_name,
cc.begin_time,cc.end_time
cc.id,cc.coupon_id,cc. begin_time,cc.end_time
</sql>
</sql>
@@ -526,6 +527,9 @@
left join wx_mall_floor mf on s.floor = mf.id
left join wx_mall_floor mf on s.floor = mf.id
where c.merchant_id = m.id
where c.merchant_id = m.id
and cc.coupon_id = c.id
and cc.coupon_id = c.id
<if test=" null != id ">
and cc.id = #{id}
</if>
<if test=" null != couponId ">
<if test=" null != couponId ">
and c.id = #{couponId}
and c.id = #{couponId}
</if>
</if>