diff --git a/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml b/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml index 7cdbfc9c1..aaf55ac11 100644 --- a/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml +++ b/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml @@ -20,8 +20,8 @@ - - + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 58a012379..8cdfbeb0f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -20,8 +20,8 @@ - - + + @@ -417,14 +417,14 @@ select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark, - c.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date, + c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date, c.auto_refund,c.business,c.subsidy_type,c.source_type,c.merchant_type,c.content_type,c.is_after_set_price,c.card_score_rule from wx_coupon c @@ -792,8 +792,8 @@ - - + + @@ -846,8 +846,8 @@ - - + + @@ -1367,7 +1367,7 @@ resultType="com.iformall.domain.po.WxCoupon"> select ct.id as id,wc.id as couponId, wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`item_group`,wc.`sale_price`,wc.`freight_price`,wc.`use_price`,wc.`use_limit_rule`,wc.`use_limit_quantity`,wc.`send_type`, - wc.sold_start_date,wc.sold_end_date,wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, + wc.sold_start_time,wc.sold_end_time,wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, wc.`press_limit_num`, wc.`press_limit_hours`,wc.`press_pay_reduce_stock`,wc.`press_support_is_new`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`, wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId @@ -1399,7 +1399,7 @@ select c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`, c.`title`,c.`sub_title`,c.`sale_price`,c.`freight_price`,c.`send_type`, - c.sold_start_date,c.sold_end_date,c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`, + c.sold_start_time,c.sold_end_time,c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`, c.`valid_days`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`, diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f51ac53ed..d7b2114f8 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -434,8 +434,8 @@ - - + + @@ -464,7 +464,7 @@ select 0 level,o.compose_order_type,o.compose_order_id,o.payment,o.order_status,o.create_date, 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_time,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.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date, + c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date, o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address` from wx_coupon c,wx_order o where o.product_id = c.id and o.order_status in (0,2) @@ -492,7 +492,7 @@ select 0 level, o.compose_order_type,o.compose_order_id,o.payment,o.order_status,o.create_date, 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_time,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.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date, + c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date, o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address` from wx_coupon c,wx_order o where o.product_id = c.id and o.order_status in (1,3,4,5)