licailing 4 anos atrás
pai
commit
d2f7b5b818

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

@@ -200,9 +200,9 @@ public class Asset extends BaseEntity {
                 .ownerAvatar(user.getAvatar())
                 .type(collection.getType())
                 .holdDays(collection.getHoldDays())
-                .headBg(collection.getHeadBg())
-                .maxCollection(collection.getMaxCollection())
-                .showroomBg(collection.getShowroomBg())
+//                .headBg(collection.getHeadBg())
+//                .maxCollection(collection.getMaxCollection())
+//                .showroomBg(collection.getShowroomBg())
                 .build();
     }
 

+ 0 - 8
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -189,12 +189,4 @@ public class Collection extends BaseEntity {
     @ApiModelProperty("开启抢白名单")
     private Boolean openQuota;
 
-    @ApiModelProperty("展厅头部背景")
-    private String headBg;
-
-    @ApiModelProperty("展厅背景")
-    private String showroomBg;
-
-    @ApiModelProperty("最多可放藏品数量")
-    private Integer maxCollection;
 }

+ 39 - 0
src/main/java/com/izouma/nineth/domain/CollectionPrivilege.java

@@ -0,0 +1,39 @@
+package com.izouma.nineth.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "collection_privilege", indexes = {
+        @Index(columnList = "collectionId")
+})
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("藏品")
+public class CollectionPrivilege extends BaseEntity {
+    private Long collectionId;
+
+    @ApiModelProperty("展厅头部背景")
+    private String headBg;
+
+    @ApiModelProperty("展厅背景")
+    private String showroomBg;
+
+    @ApiModelProperty("最多可放藏品数量")
+    private Integer maxCollection;
+
+    @ApiModelProperty("vip特权藏品")
+    private Boolean vip;
+
+
+}

+ 2 - 2
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.head_bg = ?27 " +
+            "c.open_quota = ?23, c.total_quota = ?24 " +
             "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 headBg);
+                Integer totalQuota);
 
     @Cacheable("collection")
     Optional<Collection> findById(@Nonnull Long id);

+ 1 - 2
src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -157,8 +157,7 @@ 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.getHeadBg());
+                record.getOpenQuota(), record.getTotalQuota());
 
         record = collectionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
         onShelfTask(record);