wangqifan преди 3 години
родител
ревизия
56c16c2bc0
променени са 2 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 2 2
      src/main/java/com/izouma/nineth/domain/Asset.java
  2. 6 0
      src/main/java/com/izouma/nineth/service/GiftOrderService.java

+ 2 - 2
src/main/java/com/izouma/nineth/domain/Asset.java

@@ -327,8 +327,8 @@ public class Asset extends CollectionBaseEntity {
                 .ownerId(user.getId())
                 .ownerId(user.getId())
                 .ownerAvatar(user.getAvatar())
                 .ownerAvatar(user.getAvatar())
                 .type(CollectionType.PICTURE)
                 .type(CollectionType.PICTURE)
-                .holdDays(1)
-                .oldHoldDays(1)
+                .holdDays(null)
+                .oldHoldDays(null)
                 .source(AssetSource.OFFICIAL)
                 .source(AssetSource.OFFICIAL)
                 .companyId(1L)
                 .companyId(1L)
                 .chainFlag(2)
                 .chainFlag(2)

+ 6 - 0
src/main/java/com/izouma/nineth/service/GiftOrderService.java

@@ -95,6 +95,9 @@ public class GiftOrderService {
 
 
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
             BigDecimal officialConsignment = sysConfigService.getBigDecimal("OFFICIAL_CONSIGNMENT");
             BigDecimal officialConsignment = sysConfigService.getBigDecimal("OFFICIAL_CONSIGNMENT");
+            if (asset.getType().equals(CollectionType.PICTURE)) {
+                officialConsignment = sysConfigService.getBigDecimal("picture_hold_days");
+            }
             //天转小时
             //天转小时
             int hour = officialConsignment.multiply(new BigDecimal("24")).intValue();
             int hour = officialConsignment.multiply(new BigDecimal("24")).intValue();
             if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {
             if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {
@@ -167,6 +170,9 @@ public class GiftOrderService {
 
 
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
         if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
             BigDecimal officialConsignment = sysConfigService.getBigDecimal("OFFICIAL_CONSIGNMENT");
             BigDecimal officialConsignment = sysConfigService.getBigDecimal("OFFICIAL_CONSIGNMENT");
+            if (asset.getType().equals(CollectionType.PICTURE)) {
+                officialConsignment = sysConfigService.getBigDecimal("picture_hold_days");
+            }
             //天转小时
             //天转小时
             int hour = officialConsignment.multiply(new BigDecimal("24")).intValue();
             int hour = officialConsignment.multiply(new BigDecimal("24")).intValue();
             if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {
             if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {