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

积分倍率

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
62051ad033
2 измененных файлов: 22 добавлений и 3 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/utils/CreditUtil.java
  2. +19
    -0
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

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

@@ -95,7 +95,7 @@ public class CreditUtil {
//没有发过生日券的用户或者没有享受过生日积分倍率的用户
if(Objects.isNull(wxCUserBasicInfo.getScoreDate())) {
//设置过生日的用户
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.isBirthdays(wxCUserBasicInfo.getBirthdate())) {
birthdayScale = getBirthdayScoreScale(tenantId,wxScoreRulesService);
} else {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());
@@ -104,10 +104,10 @@ public class CreditUtil {
if(Objects.nonNull(wxCUserBasicInfo.getScoreDate())){
int scoreYear = DateUtils.getYear(wxCUserBasicInfo.getScoreDate());
int year = DateUtils.getYear(new Date());
if(scoreYear == year && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0){
if(scoreYear == year && DateUtils.isBirthdays(wxCUserBasicInfo.getScoreDate())){
birthdayScale = getBirthdayScoreScale(tenantId, wxScoreRulesService);
}else{
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.isBirthdays(wxCUserBasicInfo.getBirthdate())) {
birthdayScale = getBirthdayScoreScale(tenantId,wxScoreRulesService);
} else {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());


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

@@ -1343,4 +1343,23 @@ public class DateUtils {
return year;
}

/**
* 判断生日
* @param date
* @return
*/
public static boolean isBirthdays(Date date) {
Calendar todayCal = Calendar.getInstance();
int todayMonth = todayCal.get(Calendar.MONTH) + 1;
int todayDay = todayCal.get(Calendar.DAY_OF_MONTH);
Calendar birthdayCal = Calendar.getInstance();
birthdayCal.setTime(date);
int birthMonth = birthdayCal.get(Calendar.MONTH) + 1;
int birthDay = birthdayCal.get(Calendar.DAY_OF_MONTH);
if(todayMonth == birthMonth && todayDay == birthDay){
return true;
}
return false;
}

}

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