team已读消息

src/main/java/com/izouma/nineth/service/GiftOrderService.java

@@ -91,10 +91,22 @@ public class GiftOrderService {
         }
 
         int holdDays;
-        if (ObjectUtils.isEmpty(asset.getHoldDays())) {
-            holdDays = sysConfigService.getInt("hold_days");
+        if (asset.getSource() == AssetSource.GIFT) {
+            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.isBefore(gift_change_time)) {
+                holdDays = 20;
+            } else {
+                holdDays = sysConfigService.getInt("gift_days");
+            }
         } else {
-            holdDays = asset.getHoldDays();
+            if (ObjectUtils.isEmpty(asset.getHoldDays())) {
+                holdDays = sysConfigService.getInt("hold_days");
+            } else {
+                holdDays = asset.getHoldDays();
+            }
         }
 
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
@@ -169,10 +181,22 @@ public class GiftOrderService {
         }
 
         int holdDays;
-        if (ObjectUtils.isEmpty(asset.getHoldDays())) {
-            holdDays = sysConfigService.getInt("hold_days");
+        if (asset.getSource() == AssetSource.GIFT) {
+            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.isBefore(gift_change_time)) {
+                holdDays = 20;
+            } else {
+                holdDays = sysConfigService.getInt("gift_days");
+            }
         } else {
-            holdDays = asset.getHoldDays();
+            if (ObjectUtils.isEmpty(asset.getHoldDays())) {
+                holdDays = sysConfigService.getInt("hold_days");
+            } else {
+                holdDays = asset.getHoldDays();
+            }
         }
 
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {