Browse Source

feat:修改停车劵过期流程逻辑

release_toaliyun_real
xmzhao71 2 years ago
parent
commit
19679ad714
1 changed files with 5 additions and 3 deletions
  1. +5
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java

+ 5
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java View File

@@ -526,10 +526,12 @@ public class WxCoupon extends TenantEntity {
valid_date = DateUtils.getTimeAfterDays(limit_days, curr);
} else if (this.getValidType().equals(EnumCouponValidType.TIME_AND_DAYS.getCode())) {
// 时间范围和过期天数共存,最终过期时间以最小的为主
int limit_days = this.getValidDays();
valid_date = limit_days != 0 ? DateUtils.getTimeAfterDays(limit_days, curr) : DateUtils.getDayEnd(curr);
if (this.getValidEndDate().before(valid_date)) {
Integer limit_days = this.getValidDays();
if (limit_days == null) {
valid_date = this.getValidEndDate();
} else {
valid_date = limit_days != 0 ? DateUtils.getTimeAfterDays(limit_days, curr) : DateUtils.getDayEnd(curr);
valid_date = this.getValidEndDate().before(valid_date) ? this.getValidEndDate() : valid_date;
}
} else {
//永久有效


Loading…
Cancel
Save