|
|
|
@@ -507,8 +507,9 @@ |
|
|
|
|
|
|
|
<sql id="allCUserCouponOrderListColumns"> |
|
|
|
co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, |
|
|
|
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit |
|
|
|
</sql> |
|
|
|
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, |
|
|
|
cal.channel_type as send_channel_type |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="allCUserCouponOrderDetailColumns"> |
|
|
|
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, |
|
|
|
@@ -541,6 +542,8 @@ |
|
|
|
<result column="unit" jdbcType="INTEGER" property="unit" /> |
|
|
|
<result column="remark" jdbcType="VARCHAR" property="remark" /> |
|
|
|
|
|
|
|
<result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" /> |
|
|
|
|
|
|
|
<collection column="{productId=coupon_id}" property="merchantVoList" |
|
|
|
ofType="com.iformall.domain.vo.WxMerchantVo" |
|
|
|
javaType="java.util.List" |
|
|
|
@@ -551,7 +554,8 @@ |
|
|
|
|
|
|
|
<select id="findListOfCUser" parameterType="com.iformall.domain.vo.WxCouponOrderCVo" resultMap="CVoResultMap"> |
|
|
|
select <include refid="allCUserCouponOrderListColumns" /> |
|
|
|
from wx_coupon_order co,wx_coupon c |
|
|
|
from wx_coupon c,wx_coupon_order co |
|
|
|
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id |
|
|
|
where 1=1 |
|
|
|
and co.coupon_id = c.id |
|
|
|
and co.coupon_type != 5 and co.coupon_type != 7 |
|
|
|
|