From ddc182ea291a314fa801753760b962e6bd0467a4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 29 Sep 2021 18:10:57 +0800 Subject: [PATCH] update couponOrder --- .../service/impl/WxOrderServiceImpl.java | 3 ++- .../main/resources/mapper/WxOrderMapper.xml | 24 ++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 1c0a6ad95..e117b7b83 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2527,7 +2527,8 @@ public class WxOrderServiceImpl implements WxOrderService { if(oc.getLevel().equals(1)){ record.setComposeOrderId(oc.getComposeOrderId()); record.setOrderStatus(oc.getOrderStatus()); - oc.setOrderCouponVoList(wxOrderMapper.findListOfCUser(record)); + List orderCouponVoList = wxOrderMapper.findListOfCUser(record); + oc.setOrderCouponVoList(orderCouponVoList); } }); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index aca495e0b..530dde9d5 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -261,7 +261,7 @@ 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,o.compose_order_type,o.compose_order_id, - o.`freight_price`,o.`shipping_type`,o.`shipping_address`,co.`shipping_status`,co.`delivery_info` + o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,co.`shipping_status`,co.`delivery_info` @@ -345,6 +345,7 @@ + @@ -396,6 +397,7 @@ + @@ -420,7 +422,7 @@ 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, o.compose_order_type,o.compose_order_id, - o.`freight_price`,o.`shipping_type`,o.`shipping_address` + o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address` select * from( - select 0 level,o.compose_order_type,o.compose_order_id,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,o.payment_time,o.update_date, + 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.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, - o.`freight_price`,o.`shipping_type`,o.`shipping_address` + 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) and o.compose_order_type in (0,3) @@ -474,10 +476,10 @@ union all - select 0 level, o.compose_order_type,o.compose_order_id,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,o.payment_time,o.update_date, + 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.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, - o.`freight_price`,o.`shipping_type`,o.`shipping_address` + 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) and o.compose_order_type in (0,1,2,3) @@ -496,10 +498,10 @@ union all - select 1 level,o.compose_order_type,o.compose_order_id,o.order_status,min(create_date) create_date, - null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null , + select 1 level,o.compose_order_type,o.compose_order_id,sum(o.payment) payment,o.order_status,min(create_date) create_date, + null ,null ,null ,null ,null ,null ,null ,null ,null ,null , null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null ,null , - null ,null ,null + null ,null ,null ,null from wx_order o where o.order_status in (0,2) and o.compose_order_type in (1,2)