From 79790a81dc9907141f3ef15efef1ab8f40e75108 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 17 Sep 2021 11:23:57 +0800 Subject: [PATCH] fix order --- .../controller/app/WxAppinfoController.java | 7 ++++--- .../schedule/CouponExpiringSchedule.java | 2 +- .../com/iformall/mapper/WxCouponMapper.java | 3 ++- .../main/resources/mapper/WxCouponMapper.xml | 20 +++++++++++++------ 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index fe4003535..951a101ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; +import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.QrCodeService; import com.iformall.utils.Constant; @@ -41,6 +42,9 @@ public class WxAppinfoController extends BaseController { @Autowired private WxCouponChannelMapper wxCouponChannelMapper; + + @Autowired + WxCouponMapper wxCouponMapper; ExecutorService fixedThreadPool = Executors.newFixedThreadPool(150); @@ -135,8 +139,5 @@ public class WxAppinfoController extends BaseController { } } - - - } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index c7052418a..751b0ac7e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -53,7 +53,7 @@ public class CouponExpiringSchedule { for (WxMall mall : malls) { try { wxCouponMapper.offExpiriedCouponByValidDate(mall.getTenantId()); - wxCouponMapper.offExpiriedCouponByMerchantStatus(mall.getTenantId()); + wxCouponMapper.offExpiriedCouponByMerchantStatus(mall.getTenantId(),wxCouponMapper.getValidMerchantProductIds(mall.getTenantId())); wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(mall.getTenantId()); wxCouponChannelMapper.offExpiriedCouponChannelByCouponStatus(mall.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 7ab9e250d..104d13c02 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -31,7 +31,8 @@ public interface WxCouponMapper extends CommonMapper { void offExpiriedCouponByValidDate(@Param("tenantId")String tenantId); - void offExpiriedCouponByMerchantStatus(@Param("tenantId")String tenantId); + List getValidMerchantProductIds(@Param("tenantId")String tenantId); + void offExpiriedCouponByMerchantStatus(@Param("tenantId")String tenantId,@Param("validIds")List validIds); /** * 查询时间段内销售金额 diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 5351d42de..557001081 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -713,16 +713,24 @@ where status = 0 and tenant_id =#{tenantId} and valid_type = 1 and valid_end_date < now() - + update wx_coupon c SET c.status = 1, c.update_date = now() - where c.status = 0 and c.tenant_id =#{tenantId} and - (select count(*) from wx_coupon_merchant cm, wx_merchant m + where c.status = 0 and c.tenant_id =#{tenantId} + + and c.id not in + + #{idItem} + + + + +