手动售罄

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

@@ -144,4 +144,11 @@ public class Collection extends BaseEntity {
     private String countId;
 
     private boolean scanCode;
+
+    /*
+    true: 没售罄
+    false: 已售罄
+     */
+    @ApiModelProperty("手动售罄")
+    private boolean noSoldOut;
 }

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

@@ -1,14 +1,14 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.CommissionRecord;
-import com.izouma.nineth.service.CommissionRecordService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CommissionRecordRepo;
+import com.izouma.nineth.service.CommissionRecordService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

src/main/vue/src/views/BlindBoxEdit.vue

@@ -189,6 +189,10 @@
                         <el-input v-model="formData.countId"></el-input>
                         <div class="tip">相同识别码的藏品共享限购数量</div>
                     </el-form-item>
+                    <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 class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary" v-if="!formData.id">
                             保存
@@ -407,7 +411,8 @@ export default {
                 sort: 0,
                 maxCount: 0,
                 countId: null,
-                scanCode: false
+                scanCode: false,
+                noSoldOut: true
             },
             rules: {
                 name: [

src/main/vue/src/views/BlindBoxList.vue

@@ -70,6 +70,12 @@
                 </template>
             </el-table-column>
             <el-table-column prop="price" label="价格"> </el-table-column>
+            <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 label="操作" align="center" fixed="right" width="100">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>

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

@@ -207,6 +207,10 @@
                         <el-input v-model="formData.countId"></el-input>
                         <div class="tip">相同识别码的藏品共享限购数量</div>
                     </el-form-item>
+                    <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 class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <!-- <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
@@ -315,7 +319,8 @@ export default {
                 maxCount: 0,
                 countId: null,
                 canResale: true,
-                scanCode: false
+                scanCode: false,
+                noSoldOut: true
             },
             rules: {
                 name: [

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

@@ -89,6 +89,12 @@
                 </template>
             </el-table-column>
             <el-table-column prop="price" label="价格" width="90"> </el-table-column>
+            <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 prop="sort" label="排序" width="90" align="center">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>