From 2d7886a31e706948b0b1905bb142ea3ca25a0e47 Mon Sep 17 00:00:00 2001 From: Burce Date: Fri, 16 Aug 2019 17:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E6=97=A5=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/CouponSendSchedule.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index aa7efc333..4c66978d8 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -210,7 +210,7 @@ public class CouponSendSchedule { */ @Scheduled(cron = "0 0 4 * * ?") // 测试每天6点发券 public void birthdayCouponSendSchedule() { - logger.info("生日发券任务开始"); + logger.info("生日发券: 任务开始"); List mallList = wxMallMapper.findList(new WxMall()); if (mallList.size() == 0) { logger.info("生日发券: No Mall info found"); @@ -331,7 +331,7 @@ public class CouponSendSchedule { } }); }); - logger.info("生日发券任务结束"); + logger.info("生日发券: 任务结束"); } private Map getAllCouponSendConfig(Integer sendType) { @@ -360,9 +360,11 @@ public class CouponSendSchedule { WxScoreRules rules = wxScoreRulesService.getScoreRules(cUserBasicInfo.getTenantId()); if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { int birthdayScale = rules.getScale(); - float creditScale = new BigDecimal(birthdayScale).divide(new BigDecimal(WxScoreRules.DEFAULT_SCALE)).floatValue(); - dynamicContentMap.put("creditScale", String.valueOf(creditScale)); - wxMsgRecord.setModelType(EnumMsgModel.COUPON_BIRTHDAY_OPENED.getCode()); + if (birthdayScale > WxScoreRules.DEFAULT_SCALE) { + float creditScale = new BigDecimal(birthdayScale).divide(new BigDecimal(WxScoreRules.DEFAULT_SCALE)).floatValue(); + dynamicContentMap.put("creditScale", String.valueOf(creditScale)); + wxMsgRecord.setModelType(EnumMsgModel.COUPON_BIRTHDAY_OPENED.getCode()); + } } else { //没有配置积分规则 wxMsgRecord.setModelType(EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO.getCode());