From 06357705c474178da4f3b4cb1362a3e6a464a135 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 21:57:18 +0800 Subject: [PATCH] fix --- .../schedule/CouponExpiringSchedule.java | 11 ++- .../schedule/SharingOrderResultSchedule.java | 74 +++++++++++-------- .../schedule/WxCUserCheckSchedule.java | 26 +++---- .../com/iformall/mapper/WxCUserMapper.java | 2 +- .../iformall/mapper/WxCouponSendMapper.java | 2 +- .../resources/mapper/WxCouponSendMapper.xml | 4 +- 6 files changed, 69 insertions(+), 50 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 15ba52a35..c7052418a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -55,7 +55,7 @@ public class CouponExpiringSchedule { wxCouponMapper.offExpiriedCouponByValidDate(mall.getTenantId()); wxCouponMapper.offExpiriedCouponByMerchantStatus(mall.getTenantId()); - wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(); + wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(mall.getTenantId()); wxCouponChannelMapper.offExpiriedCouponChannelByCouponStatus(mall.getTenantId()); }catch(Exception e) { logger.error("couponExpiringSchedule error.mall:"+mall.getTenantId(),e); @@ -66,7 +66,14 @@ public class CouponExpiringSchedule { @Scheduled(cron = "0 10 0 * * ?") // 每天凌晨00:10 下架定向发放 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void couponSendExpiringSchedule() { - wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(); + List malls = getMalls(); + for (WxMall mall : malls) { + try { + wxCouponSendMapper.offExpiriedCouponSendByCouponStatus(mall.getTenantId()); + }catch(Exception e) { + logger.error("couponExpiringSchedule error.mall:"+mall.getTenantId(),e); + } + } } @Scheduled(cron = "0 10 0 * * ?") // 每天凌晨00:10 下架主动领取 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 428519990..5dc18648a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -1,6 +1,7 @@ package com.iformall.schedule; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxProfitSharingOrder; import com.iformall.enums.EnumProfitSharingOrderStatus; import com.iformall.mapper.*; @@ -24,40 +25,51 @@ public class SharingOrderResultSchedule { @Autowired private WxProfitSharingOrderMapper wxProfitSharingOrderMapper; + @Autowired + WxMallMapper wxMallMapper; + + private List getMalls() { + WxMall wxMall =new WxMall(); + return wxMallMapper.findList(wxMall); + } + @Scheduled(cron = "0 15 0 * * ?") // 每天凌晨00:15更新分账结果 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void sharingOrderResultSchedule() { - - WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); - wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); - List list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); - for(WxProfitSharingOrder sharingOrder : list) { - try { - ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); - logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() - + " ID:" +sharingOrder.getId() - + " MSG:" + result.message); - } catch (Exception e){ - logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() - + " ID:" +sharingOrder.getId() - + " MSG:" + e.getMessage()); - } - } - - wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getCode()); - list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); - for(WxProfitSharingOrder sharingOrder : list) { - try { - ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); - logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() - + " ID:" + sharingOrder.getId() - + " MSG:" + result.message); - } catch (Exception e){ - logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() - + " ID:" +sharingOrder.getId() - + " MSG:" + e.getMessage()); - } - } + List malls = getMalls(); + for (WxMall mall: malls) { + WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); + wxProfitSharingOrder.setTenantId(mall.getTenantId()); + wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); + List list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); + for(WxProfitSharingOrder sharingOrder : list) { + try { + ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); + logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() + + " ID:" +sharingOrder.getId() + + " MSG:" + result.message); + } catch (Exception e){ + logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() + + " ID:" +sharingOrder.getId() + + " MSG:" + e.getMessage()); + } + } + + wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getCode()); + list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); + for(WxProfitSharingOrder sharingOrder : list) { + try { + ResultData result = wxProfitSharingOrderService.querySharingOrder(sharingOrder); + logger.info("状态更新结果:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() + + " ID:" + sharingOrder.getId() + + " MSG:" + result.message); + } catch (Exception e){ + logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() + + " ID:" +sharingOrder.getId() + + " MSG:" + e.getMessage()); + } + } + } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java index 401c5915e..08626bfb8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -30,17 +30,17 @@ public class WxCUserCheckSchedule { //@Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 // @Scheduled(cron = "0 */1 * * * ?") // 测试1分钟一次 - public void cuserCheckDuplicate() { - - List> mapList = cUserMapper.checkCountByTenantOpenId(); - if(mapList.size()> 0) { - String message = "wx_c_user异常,有重复数据"; - logger.error(message); - if(isFmException) { - String[] receivers = fmExceptionEmails.split(","); - //发送邮件 - mailService.sendSimpleMail(receivers, message, message); - } - } - } +// public void cuserCheckDuplicate() { +// +// List> mapList = cUserMapper.checkCountByTenantOpenId(); +// if(mapList.size()> 0) { +// String message = "wx_c_user异常,有重复数据"; +// logger.error(message); +// if(isFmException) { +// String[] receivers = fmExceptionEmails.split(","); +// //发送邮件 +// mailService.sendSimpleMail(receivers, message, message); +// } +// } +// } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index e36fa490b..7500b1af3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -30,7 +30,7 @@ public interface WxCUserMapper extends CommonMapper { long countByChannel(WxCUser wxCUser); - List> checkCountByTenantOpenId(); + //List> checkCountByTenantOpenId(); void updateUserId(WxCUser user); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java index 0d6675079..bc12d86c2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java @@ -17,7 +17,7 @@ public interface WxCouponSendMapper extends CommonMapper { void updateStatusByCouponId(WxCouponSend wxCouponSend); - void offExpiriedCouponSendByCouponStatus(); + void offExpiriedCouponSendByCouponStatus(String tenantId); void updateBirthdayConfig(WxCouponSend wxCouponSend); diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index b79c11a81..ea0774827 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -168,10 +168,10 @@ and tenant_id = #{tenantId} - + update wx_coupon_send cs, wx_coupon c set cs.status=1, cs.update_date = now() - where c.id = cs.coupon_id and cs.status = 0 and + where c.id = cs.coupon_id and cs.status = 0 and cs.tenant_id = #{tenantId} and ((c.status = 1) or (c.valid_type = 1 and c.valid_end_date < now()))