From 9054592f485d72dab7ef8a144174dbf113060eff Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 29 Mar 2019 14:41:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxOrderGroupMapper.xml | 3 ++- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 07ac78acb..0f23416e6 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -70,7 +70,8 @@ select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId, - o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum,c.status couponStatus + o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum, + (select status from wx_coupon_channel where id=o.coupon_channel_id) couponStatus from wx_order o left join wx_coupon c on o.product_id=c.id left join wx_order_group g on o.order_group_id=g.id diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 9ba8164c4..bd91adeed 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -205,7 +205,7 @@ update wx_order set order_status=#{orderStatus},update_date=#{updateDate} - where product_id=#{productId} and order_status = 10 + where product_id=#{productId} and order_status in(10,15) and `tenant_id` = #{tenantId} @@ -213,7 +213,7 @@ update wx_order set order_status=#{orderStatus},update_date=#{updateDate} - where coupon_channel_id=#{couponChannelId} and order_status = 10 + where coupon_channel_id=#{couponChannelId} and order_status in(10,15) and `tenant_id` = #{tenantId}