|
|
@@ -37,6 +37,7 @@ import javax.persistence.criteria.Predicate;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.Duration;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ExecutionException;
|
|
|
@@ -372,7 +373,15 @@ public class AssetService {
|
|
|
|
|
|
int holdDays;
|
|
|
if (asset.getSource() == AssetSource.GIFT) {
|
|
|
- holdDays = sysConfigService.getInt("gift_days");
|
|
|
+ LocalDateTime localDateTime = asset.getCreatedAt();
|
|
|
+ LocalDateTime gift_change_time = LocalDateTime
|
|
|
+ .parse(sysConfigService.getString("gift_change_time"), DateTimeFormatter
|
|
|
+ .ofPattern("yyyy-MM-dd HH:mm:ss"));
|
|
|
+ if (localDateTime.compareTo(gift_change_time) < 0) {
|
|
|
+ holdDays = 20;
|
|
|
+ } else {
|
|
|
+ holdDays = sysConfigService.getInt("gift_days");
|
|
|
+ }
|
|
|
} else {
|
|
|
if (ObjectUtils.isEmpty(asset.getHoldDays())) {
|
|
|
holdDays = sysConfigService.getInt("hold_days");
|