|
|
@@ -95,6 +95,9 @@ public class GiftOrderService {
|
|
|
|
|
|
if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
|
|
|
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();
|
|
|
if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {
|
|
|
@@ -167,6 +170,9 @@ public class GiftOrderService {
|
|
|
|
|
|
if (holdDays == 0 && AssetSource.OFFICIAL.equals(asset.getSource())) {
|
|
|
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();
|
|
|
if (ChronoUnit.HOURS.between(asset.getCreatedAt(), LocalDateTime.now()) < hour) {
|