|
|
|
@@ -253,7 +253,7 @@ |
|
|
|
<sql id="allCUserOrderDetailColumns"> |
|
|
|
o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, |
|
|
|
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, |
|
|
|
co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num |
|
|
|
co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num,co.compose_order_type,co.compose_order_id |
|
|
|
</sql> |
|
|
|
|
|
|
|
<update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> |
|
|
|
@@ -330,6 +330,9 @@ |
|
|
|
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/> |
|
|
|
<result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" /> |
|
|
|
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> |
|
|
|
|
|
|
|
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> |
|
|
|
<result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> |
|
|
|
|
|
|
|
<collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList" |
|
|
|
ofType="com.iformall.domain.vo.WxMerchantVo" |
|
|
|
@@ -347,7 +350,8 @@ |
|
|
|
|
|
|
|
<sql id="allCUserOrderListColumns"> |
|
|
|
o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, |
|
|
|
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date |
|
|
|
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, |
|
|
|
co.compose_order_type,co.compose_order_id |
|
|
|
</sql> |
|
|
|
|
|
|
|
<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> |
|
|
|
|