From 2c089f37f044a4e91ee4ffa90410316b115cb189 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 26 Aug 2019 18:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=B3=A8?= =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxCouponSendMapper.xml | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index b80c584d4..214ba150c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -32,7 +32,7 @@ else '[多商户通用]' end) as merchant_name, - c.remain_inventory, c.use_limit_quantity, c.inventory, c.valid_start_date, c.valid_end_date,cs.send_sms + c.remain_inventory, c.use_limit_quantity, c.inventory, c.valid_start_date, c.valid_end_date,c.valid_type,cs.send_sms @@ -109,17 +109,20 @@ from wx_coupon_send cs left join wx_coupon c on c.id = cs.coupon_id ) as tt - where 1=1 - - - and = now() ]]> - - - and - - - - + where + (tt.valid_type=1 + + + and = now() ]]> + + + and + + + + + ) + or tt.valid_type=2