展厅加价格

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.Where;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 @Data
 @AllArgsConstructor
@@ -38,5 +39,7 @@ public class ShowCollection extends BaseEntity {
 
     private String status;
 
+    private BigDecimal price;
+
     private int sort;
 }

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

@@ -99,6 +99,7 @@ public class ShowroomService {
                 showCollection.setShowroomId(show.getId());
                 showCollection.setAssetId(collection.getAssetId());
                 showCollection.setStatus(getStatus(collection));
+                showCollection.setPrice(collection.getPrice());
                 showCollectionRepo.save(showCollection);
             }
         });
@@ -227,7 +228,7 @@ public class ShowroomService {
                             // 可能没有
                             coll.setAssetId(collection.getAssetId());
                             coll.setStatus(getStatus(collection));
-
+                            coll.setPrice(collection.getPrice());
                             showCollectionRepo.save(coll);
                         }
                     }
@@ -274,37 +275,19 @@ public class ShowroomService {
             return "仅展示";
         }
         if (collection.getSoldOut() > 1) {
-            return "已售罄";
+            return "寄售中";
         }
         if (collection.isNoSoldOut()) {
-            return "已售罄";
+            return "仅展示";
         }
         if (collection.getSoldOut() != 1 & collection.getStock() == 0) {
-            return "即将售罄";
+            return "仅展示";
         }
         return "寄售中";
     }
 
     public String getStatusById(Long collectionId) {
         Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("暂无"));
-        boolean salable = collection.isSalable();
-        if (collection.getSaleTime() != null) {
-            if (collection.getSaleTime().isAfter(LocalDateTime.now())) {
-                return "仅展示";
-            }
-        }
-        if (!salable) {
-            return "仅展示";
-        }
-        if (collection.getSoldOut() > 1) {
-            return "已售罄";
-        }
-        if (collection.isNoSoldOut()) {
-            return "已售罄";
-        }
-        if (collection.getSoldOut() != 1 & collection.getStock() == 0) {
-            return "即将售罄";
-        }
-        return "寄售中";
+        return getStatus(collection);
     }
 }

src/main/java/com/izouma/nineth/web/ShowroomController.java

@@ -9,6 +9,7 @@ import com.izouma.nineth.domain.User;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.NewsLikeRepo;
 import com.izouma.nineth.repo.ShowCollectionRepo;
 import com.izouma.nineth.repo.ShowroomRepo;
@@ -34,6 +35,7 @@ public class ShowroomController extends BaseController {
     private ShowroomRepo       showroomRepo;
     private ShowCollectionRepo showCollectionRepo;
     private NewsLikeRepo       newsLikeRepo;
+    private CollectionRepo     collectionRepo;
 
     @PostMapping("/save")
     public Showroom save(@RequestBody Showroom record) {
@@ -74,7 +76,10 @@ public class ShowroomController extends BaseController {
             List<ShowCollection> collections = collect.get(showroom.getId());
             List<ShowCollection> neo = new ArrayList<>();
             collections.forEach(orig -> {
-                orig.setStatus(showroomService.getStatusById(orig.getCollectionId()));
+                Collection collection = collectionRepo.findById(orig.getCollectionId())
+                        .orElseThrow(new BusinessException("暂无"));
+                orig.setStatus(showroomService.getStatus(collection));
+                orig.setPrice(collection.getPrice());
                 neo.add(orig);
             });
             if (CollUtil.isNotEmpty(neo)) {
@@ -93,7 +98,10 @@ public class ShowroomController extends BaseController {
         List<ShowCollection> origin = showCollectionRepo.findAllByShowroomIdOrderBySort(id);
         List<ShowCollection> neo = new ArrayList<>();
         origin.forEach(orig -> {
-            orig.setStatus(showroomService.getStatusById(orig.getCollectionId()));
+            Collection collection = collectionRepo.findById(orig.getCollectionId())
+                    .orElseThrow(new BusinessException("暂无"));
+            orig.setStatus(showroomService.getStatus(collection));
+            orig.setPrice(collection.getPrice());
             neo.add(orig);
         });
         showroom.setCollections(neo);