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

积分倍率

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

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

@@ -101,10 +101,20 @@ public class CreditUtil {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());
}
} else {
//发过生日券的用户或者享受过生日积分倍率的用户
if (Objects.nonNull(wxCUserBasicInfo.getScoreDate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getScoreDate()) == 0) {
birthdayScale = getBirthdayScoreScale(tenantId, wxScoreRulesService);
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){
birthdayScale = getBirthdayScoreScale(tenantId, wxScoreRulesService);
}else{
if (Objects.nonNull(wxCUserBasicInfo.getBirthdate()) && DateUtils.birthdaysBetween(wxCUserBasicInfo.getBirthdate()) == 0) {
birthdayScale = getBirthdayScoreScale(tenantId,wxScoreRulesService);
} else {
log.info("积分倍率计算:未设置生日或生日条件未匹配={}", wxCUserBasicInfo.getScoreDate());
}
}
}

}

//配置了生日积分倍率,保存到上下文


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

@@ -1329,4 +1329,18 @@ public class DateUtils {
int month = cal.get(Calendar.MONTH) + 1;
return month;
}

/**
* 获取当前日期是哪年<br>
*
* @param date
* @return 获取当前日期是哪年
*/
public static int getYear(Date date) {
Calendar cal = Calendar.getInstance();
cal.setTime(date);
int year = cal.get(Calendar.YEAR);
return year;
}

}

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