两个背景

src/main/java/com/izouma/nineth/domain/Asset.java

@@ -164,6 +164,9 @@ public class Asset extends BaseEntity {
     @ApiModelProperty("持有几天")
     private Integer holdDays;
 
+    @ApiModelProperty("展厅头部背景")
+    private String headBg;
+
     @ApiModelProperty("展厅背景")
     private String showroomBg;
 
@@ -197,6 +200,7 @@ public class Asset extends BaseEntity {
                 .ownerAvatar(user.getAvatar())
                 .type(collection.getType())
                 .holdDays(collection.getHoldDays())
+                .headBg(collection.getHeadBg())
                 .maxCollection(collection.getMaxCollection())
                 .showroomBg(collection.getShowroomBg())
                 .build();

src/main/java/com/izouma/nineth/domain/Collection.java

@@ -189,6 +189,9 @@ public class Collection extends BaseEntity {
     @ApiModelProperty("开启抢白名单")
     private Boolean openQuota;
 
+    @ApiModelProperty("展厅头部背景")
+    private String headBg;
+
     @ApiModelProperty("展厅背景")
     private String showroomBg;
 

src/main/java/com/izouma/nineth/domain/Showroom.java

@@ -48,6 +48,9 @@ public class Showroom extends BaseEntity {
     @ApiModelProperty("最多可放藏品数量")
     private int maxCollection;
 
+    @ApiModelProperty("头部背景")
+    private String headBg;
+
     @ApiModelProperty("展厅背景")
     private String showroomBg;
 

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -31,7 +31,7 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
             "c.properties = ?9, c.model3d = ?10, c.max_count = ?11, c.count_id = ?12, c.scan_code = ?13, " +
             "c.no_sold_out = ?14, c.assignment = ?15, c.coupon_payment = ?16, c.share_bg = ?17," +
             "c.register_bg = ?18, c.vip_quota = ?19, c.time_delay = ?20, c.sale_time = ?21, c.hold_days = ?22, " +
-            "c.open_quota = ?23, c.showroom_bg = ?24, c.max_collection = ?25, c.total_quota = ?26 " +
+            "c.open_quota = ?23, c.showroom_bg = ?24, c.max_collection = ?25, c.total_quota = ?26, c.head_bg = ?27 " +
             "where c.id = ?1", nativeQuery = true)
     @CacheEvict(value = {"collection", "recommend"}, allEntries = true)
     void update(@Nonnull Long id, boolean onShelf, boolean salable, LocalDateTime startTime,
@@ -39,7 +39,7 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
                 String properties, String model3d, int maxCount, String countId, boolean scanCode,
                 boolean noSoldOut, int assignment, boolean couponPayment, String shareBg, String registerBg,
                 Integer vipQuota, Boolean timeDelay, LocalDateTime saleTime, Integer holdDays, Boolean openQuota,
-                String showroomBg, Integer maxCollection, Integer totalQuota);
+                String showroomBg, Integer maxCollection, Integer totalQuota, String headBg);
 
     @Cacheable("collection")
     Optional<Collection> findById(@Nonnull Long id);

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

@@ -157,7 +157,8 @@ public class CollectionService {
                 record.getMaxCount(), record.getCountId(), record.isScanCode(), record.isNoSoldOut(),
                 record.getAssignment(), record.isCouponPayment(), record.getShareBg(), record.getRegisterBg(),
                 record.getVipQuota(), record.getTimeDelay(), record.getSaleTime(), record.getHoldDays(),
-                record.getOpenQuota(), record.getShowroomBg(), record.getMaxCollection(), record.getTotalQuota());
+                record.getOpenQuota(), record.getShowroomBg(), record.getMaxCollection(), record.getTotalQuota(),
+                record.getHeadBg());
 
         record = collectionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
         onShelfTask(record);
@@ -531,10 +532,15 @@ public class CollectionService {
         log.info(dft.format(time) + "前完成任务人数：{}", collect.size());
         log.info("sql: update user set vip_point = 1 where id in ({})", longArrayConverter.convertToDatabaseColumn(collect));
 
-        List<PointDTO> collect1 = dtos.stream().filter(dto -> time.isAfter(dto.getCreatedAt())).collect(Collectors.toList());
+        List<PointDTO> collect1 = dtos.stream()
+                .filter(dto -> time.isAfter(dto.getCreatedAt()))
+                .collect(Collectors.toList());
         log.info(dft.format(time) + "后完成任务人数：{}", collect1.size());
 
-        List<Long> collect2 = dtos.stream().filter(dto -> dto.getIdentitySum() > 0).map(PointDTO::getId).collect(Collectors.toList());
+        List<Long> collect2 = dtos.stream()
+                .filter(dto -> dto.getIdentitySum() > 0)
+                .map(PointDTO::getId)
+                .collect(Collectors.toList());
         log.info("邀请实名认证人量：{}", collect2.size());
         log.info("sql: update user set vip_point = 1 where id in ({})", longArrayConverter.convertToDatabaseColumn(collect2));
 

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

@@ -81,6 +81,7 @@ public class ShowroomService {
         });
 
         showroom.setUserId(userId);
+        showroom.setHeadBg(asset.getHeadBg());
         showroom.setShowroomBg(asset.getShowroomBg());
         showroom.setMaxCollection(asset.getMaxCollection());
         showroom.setNickname(asset.getOwnerName());
@@ -91,7 +92,7 @@ public class ShowroomService {
             if (ObjectUtils.isNotEmpty(collection)) {
                 FileObject pic = collection.getPic().get(0);
                 showCollection.setPic(pic.getUrl());
-                if("video/mp4".equals(pic.getType())){
+                if ("video/mp4".equals(pic.getType())) {
                     showCollection.setPic(pic.getThumb());
                 }
                 showCollection.setShowroomId(show.getId());
@@ -114,6 +115,7 @@ public class ShowroomService {
             throw new BusinessException("已创建过展厅");
         }
         Showroom showroom = Showroom.builder()
+                .headBg(asset.getHeadBg())
                 .showroomBg(asset.getShowroomBg())
                 .maxCollection(asset.getMaxCollection())
                 .publish(false)
@@ -181,7 +183,7 @@ public class ShowroomService {
                         if (ObjectUtils.isNotEmpty(collection)) {
                             FileObject pic = collection.getPic().get(0);
                             coll.setPic(pic.getUrl());
-                            if("video/mp4".equals(pic.getType())){
+                            if ("video/mp4".equals(pic.getType())) {
                                 coll.setPic(pic.getThumb());
                             }
                             coll.setShowroomId(recordRoom.getId());

src/main/vue/src/views/ShowroomEdit.vue

@@ -203,7 +203,14 @@
                     </div>
 
                     <el-form-item prop="holdDays" label="持有天数">
-                        <el-input-number type="number" :min="0" :step="1" :max="2147483647" v-model="formData.holdDays" style="width: 180px"></el-input-number>
+                        <el-input-number
+                            type="number"
+                            :min="0"
+                            :step="1"
+                            :max="2147483647"
+                            v-model="formData.holdDays"
+                            style="width: 180px"
+                        ></el-input-number>
                         <div class="tip">持有多少天可转赠/转让。为空时，按系统设置天数。</div>
                     </el-form-item>
                     <el-form-item prop="noSoldOut" label="售罄">
@@ -217,6 +224,9 @@
                         </el-radio-group>
                     </el-form-item>
 
+                    <el-form-item prop="headBg" label="展厅头部背景">
+                        <single-upload v-model="formData.headBg"></single-upload>
+                    </el-form-item>
                     <el-form-item prop="showroomBg" label="展厅背景">
                         <single-upload v-model="formData.showroomBg"></single-upload>
                     </el-form-item>