|
|
@@ -264,7 +264,7 @@ public class AssetService {
|
|
|
asset.setNumber(number);
|
|
|
asset.setOrderId(orderId);
|
|
|
asset.setPrice(price);
|
|
|
- asset.setPrefixName("RID");
|
|
|
+ asset.setPrefixName("RID" + domainOrder.getPicName().length());
|
|
|
asset.setTags(new HashSet<>());
|
|
|
User fakeUser = null;
|
|
|
if (safeFlag) {
|
|
|
@@ -494,22 +494,24 @@ public class AssetService {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- int holdDays;
|
|
|
- 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.compareTo(gift_change_time) < 0) {
|
|
|
- holdDays = 20;
|
|
|
- } else {
|
|
|
- holdDays = sysConfigService.getInt("gift_days");
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (ObjectUtils.isEmpty(asset.getHoldDays())) {
|
|
|
- holdDays = sysConfigService.getInt("hold_days");
|
|
|
+ int holdDays = 0;
|
|
|
+ if (!asset.getType().equals(CollectionType.DOMAIN)) {
|
|
|
+ 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.compareTo(gift_change_time) < 0) {
|
|
|
+ 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())) {
|