| @@ -210,7 +210,7 @@ public class CouponSendSchedule { | |||||
| */ | */ | ||||
| @Scheduled(cron = "0 0 4 * * ?") // 测试每天6点发券 | @Scheduled(cron = "0 0 4 * * ?") // 测试每天6点发券 | ||||
| public void birthdayCouponSendSchedule() { | public void birthdayCouponSendSchedule() { | ||||
| logger.info("生日发券任务开始"); | |||||
| logger.info("生日发券: 任务开始"); | |||||
| List<WxMall> mallList = wxMallMapper.findList(new WxMall()); | List<WxMall> mallList = wxMallMapper.findList(new WxMall()); | ||||
| if (mallList.size() == 0) { | if (mallList.size() == 0) { | ||||
| logger.info("生日发券: No Mall info found"); | logger.info("生日发券: No Mall info found"); | ||||
| @@ -331,7 +331,7 @@ public class CouponSendSchedule { | |||||
| } | } | ||||
| }); | }); | ||||
| }); | }); | ||||
| logger.info("生日发券任务结束"); | |||||
| logger.info("生日发券: 任务结束"); | |||||
| } | } | ||||
| private Map<String, Integer> getAllCouponSendConfig(Integer sendType) { | private Map<String, Integer> getAllCouponSendConfig(Integer sendType) { | ||||
| @@ -360,9 +360,11 @@ public class CouponSendSchedule { | |||||
| WxScoreRules rules = wxScoreRulesService.getScoreRules(cUserBasicInfo.getTenantId()); | WxScoreRules rules = wxScoreRulesService.getScoreRules(cUserBasicInfo.getTenantId()); | ||||
| if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { | if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { | ||||
| int birthdayScale = 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 { | } else { | ||||
| //没有配置积分规则 | //没有配置积分规则 | ||||
| wxMsgRecord.setModelType(EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO.getCode()); | wxMsgRecord.setModelType(EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO.getCode()); | ||||