From de96627dafb771886d469819d9f8b17d3a83260c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 5 Jul 2019 16:33:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=A5=E5=90=8D=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=90=8E=E7=8A=B6=E6=80=81=E4=B8=BA=E6=8A=A5=E5=90=8D=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/schedule/ActivitySchedule.java | 1 + .../main/java/com/iformall/mapper/WxActivityJoinMapper.java | 1 + .../src/main/resources/mapper/WxActivityJoinMapper.xml | 5 ++++- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java index ef778a5b0..68a1267c8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java @@ -99,6 +99,7 @@ public class ActivitySchedule { activity.setIsExpired(EnumActivityExpired.YES.getCode()); activity.setUpdateTime(new Date()); wxActivityMapper.activityExipred(activity); + wxActivityJoinMapper.activityExpired(); } /** diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java index 25628e3a9..bd130e2dc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxActivityJoinMapper.java @@ -20,4 +20,5 @@ public interface WxActivityJoinMapper extends CommonMapper void updateStatus(List wxActivity); + void activityExpired(); } diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 67b132c66..06eb2c96d 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -104,6 +104,9 @@ #{activity.id} - + + + update wx_activity_join set `status`=2 where `status`!=2 and activity_id in(select id from wx_activity where is_expired=1) + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index f24499988..702ac14e9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -474,6 +474,10 @@ and c.business = #{business} + + and bu.verify_merchant_name = #{verifyMerchantName} + + and co.coupon_id in( select cm.product_id from wx_merchant_shop ms left join wx_merchant m on ms.merchant_id=m.id