Parcourir la source

更新生日积分倍率计算

release_toaliyun_real
Burce il y a 6 ans
Parent
révision
2183407bd1
3 fichiers modifiés avec 18 ajouts et 6 suppressions
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
  3. +16
    -4
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java Voir le fichier

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/utils/CreditUtil.java Voir le fichier

@@ -36,7 +36,7 @@ public class CreditUtil {
// 获取生日积分倍率: // 获取生日积分倍率:
int birthdayScale = WxScoreRules.DEFAULT_SCALE; int birthdayScale = WxScoreRules.DEFAULT_SCALE;
//判断是否生日当天 //判断是否生日当天
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.daysBetween(new Date(), wxCUserBasicInfo.getBirthdate()) == 0) {
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
WxScoreRules rules = wxScoreRulesService.getScoreRules(wxCUser.getTenantId()); WxScoreRules rules = wxScoreRulesService.getScoreRules(wxCUser.getTenantId());
if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) { if (Objects.nonNull(rules) && Objects.nonNull(rules.getScale())) {
birthdayScale = rules.getScale(); birthdayScale = rules.getScale();


+ 16
- 4
mallinkService/src/main/java/com/iformall/utils/DateUtils.java Voir le fichier

@@ -5,10 +5,7 @@ import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; 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.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
@@ -1080,6 +1077,21 @@ public class DateUtils {
return 0; 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个月后的第一天 * 获取指定日期n个月后的第一天
* @return * @return


Chargement…
Annuler
Enregistrer