Просмотр исходного кода

Merge branch 'devlocal' into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
bd66600277
4 измененных файлов: 21 добавлений и 8 удалений
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
  4. +16
    -4
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java Просмотреть файл

@@ -287,7 +287,7 @@ public class CouponSendSchedule {
continue;
}
//提前n天发送生日券,不满足跳过不执行
if (DateUtils.daysBetween(cu.getBirthdate(), new Date()) == beforeDays) {
if (DateUtils.birthdaysBetween(cu.getBirthdate()) == beforeDays) {
continue;
}
if (cs.getRemainInventory() <= 0) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Просмотреть файл

@@ -144,7 +144,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
final IdWorker idWorker = IdWorker.get();
scoreRules.setId(idWorker.nextId());
scoreRules.setRules(WxScoreRules.getCreditDefaultRules());
scoreRules.setScale(WxScoreRules.DEFAULT_SCALE);
wxScoreRulesMapper.insertSelective(scoreRules);
}



+ 3
- 2
mallinkService/src/main/java/com/iformall/utils/CreditUtil.java Просмотреть файл

@@ -36,11 +36,12 @@ public class CreditUtil {
// 获取生日积分倍率:
int birthdayScale = WxScoreRules.DEFAULT_SCALE;
//判断是否生日当天
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.daysBetween(new Date(), wxCUserBasicInfo.getBirthdate()) == 0) {
WxScoreRules rules = wxScoreRulesService.getScoreRules(wxCUser.getTenantId());
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
WxScoreRules rules = wxScoreRulesService.getCreditRules(wxCUser.getTenantId());
if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) {
birthdayScale = rules.getScale();
} else {
log.info("会员生日券倍率配置:null");
//没有配置积分规则
}
}


+ 16
- 4
mallinkService/src/main/java/com/iformall/utils/DateUtils.java Просмотреть файл

@@ -5,10 +5,7 @@ import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Period;
import java.time.ZoneId;
import java.time.*;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Calendar;
@@ -1080,6 +1077,21 @@ public class DateUtils {
return 0;
}

/**
* 日期距离今天还有几天
*
* @param date
* @return <0 今后n天?
*/
public static int birthdaysBetween(Date date) {
Date today = new Date() ;
date.setYear(today.getYear());
Calendar todayCal = Calendar.getInstance();
Calendar birthdayCal = Calendar.getInstance();
birthdayCal.setTime(date);
return todayCal.get(Calendar.DAY_OF_YEAR) - birthdayCal.get(Calendar.DAY_OF_YEAR) ;
}

/**
* 获取指定日期n个月后的第一天
* @return


Загрузка…
Отмена
Сохранить