手动售罄

src/main/vue/src/views/CollectionEdit.vue

@@ -224,10 +224,10 @@
                             <div class="tip">相同识别码的藏品共享限购数量</div>
                         </el-form-item>
                     </div>
-                    <!-- <el-form-item prop="noSoldOut" label="手动售罄">
+                    <el-form-item prop="noSoldOut" label="售罄">
                         <el-radio v-model="formData.noSoldOut" :label="false">是</el-radio>
                         <el-radio v-model="formData.noSoldOut" :label="true">否</el-radio>
-                    </el-form-item> -->
+                    </el-form-item>
                     <el-form-item prop="couponPayment" label="支付方式">
                         <el-radio-group v-model="formData.couponPayment">
                             <el-radio :label="true">兑换券</el-radio>

src/main/vue/src/views/CollectionList.vue

@@ -89,12 +89,12 @@
                 </template>
             </el-table-column>
             <el-table-column prop="price" label="价格" width="90"> </el-table-column>
-            <!-- <el-table-column prop="noSoldOut" label="手动售罄">
+            <el-table-column prop="noSoldOut" label="售罄">
                 <template v-slot="{ row }">
                     <el-tag type="success" v-if="!row.noSoldOut">是</el-tag>
                     <el-tag type="info" v-else>否</el-tag>
                 </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column prop="sort" label="排序" width="90" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>

src/test/java/com/izouma/nineth/service/CollectionServiceTest.java

@@ -7,6 +7,7 @@ import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.FileObject;
 import com.izouma.nineth.dto.CreateBlindBox;
 import com.izouma.nineth.enums.CollectionType;
+import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.PrivilegeOptionRepo;
 import com.izouma.nineth.repo.UserRepo;
@@ -22,6 +23,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
@@ -120,4 +122,19 @@ class CollectionServiceTest extends ApplicationTests {
                 + "." + ext;
         return new FileObject("", storageService.uploadFromInputStream(new FileInputStream(file), path), null, ext);
     }
+
+    @Test
+    public void test1() {
+        Long collectionId = 2570204L;
+        Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("无藏品"));
+        if (!collection.isOnShelf() || !collection.isSalable()) {
+            collectionId = null;
+        } else if (collection.isScheduleSale()) {
+            if (collection.getStartTime().isAfter(LocalDateTime.now())){
+                collectionId = null;
+            }
+        }
+        System.out.println(collectionId);
+    }
+
 }

src/test/java/com/izouma/nineth/service/UserServiceTest.java

@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class UserServiceTest extends ApplicationTests {