Merge branch 'dev'

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

@@ -403,6 +403,13 @@ public class AssetService {
             throw new BusinessException("已锁仓，不能寄售");
         }
 
+        List<String> bannedAssets = Arrays.asList(sysConfigService.getString("older_collections").split(",").clone());
+        bannedAssets.forEach(name -> {
+            if (asset.getName().contains(name)) {
+                throw new BusinessException("编年史藏品无法寄售");
+            }
+        });
+
         int holdDays;
         if (asset.getSource() == AssetSource.GIFT) {
             LocalDateTime localDateTime = asset.getCreatedAt();
@@ -1069,7 +1076,9 @@ public class AssetService {
                 .source(source)
                 .remark(remark)
                 .build();
-        destroyRecord.setPic("video/mp4".equals(asset.getPic().get(0).getType()) ? asset.getPic().get(0).getThumb() : asset.getPic().get(0).getUrl());
+        destroyRecord
+                .setPic("video/mp4".equals(asset.getPic().get(0).getType()) ? asset.getPic().get(0).getThumb() : asset
+                        .getPic().get(0).getUrl());
         destroyRecordRepo.save(destroyRecord);
         //加积分
         userRepo.addDestroyPoint(userId, 1);