xiongzhu 4 years ago
parent
commit
b4383a4b0d

+ 4 - 0
src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -148,6 +148,10 @@ public class CollectionService {
     @Transactional
     public Collection createBlindBox(CreateBlindBox createBlindBox) {
         Collection blindBox = createBlindBox.getBlindBox();
+        if (blindBox.getId() != null) {
+            collectionRepo.save(blindBox);
+            return blindBox;
+        }
 
         List<Collection> list =
                 collectionRepo.findAllById(createBlindBox.getItems().stream().map(BlindBoxItem::getCollectionId)

+ 12 - 8
src/main/vue/src/views/BlindBoxEdit.vue

@@ -129,19 +129,23 @@
                     <!-- <el-form-item prop="likes" label="点赞">
                         <el-input-number v-model="formData.likes"></el-input-number>
                     </el-form-item> -->
-                    <el-form-item prop="onShelf" label="上架">
+                    <el-form-item prop="startTime" label="定时发布">
+                        <el-switch v-model="formData.scheduleSale" active-text="是" inactive-text="否"></el-switch>
+                        <div style="margin-top: 10px" v-if="formData.scheduleSale">
+                            <el-date-picker
+                                v-model="formData.startTime"
+                                type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="发布时间"
+                            ></el-date-picker>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="onShelf" label="上架" v-if="!formData.scheduleSale">
                         <el-switch v-model="formData.onShelf" active-text="上架" inactive-text="下架"></el-switch>
                     </el-form-item>
                     <el-form-item prop="salable" label="可售">
                         <el-switch v-model="formData.salable" active-text="可销售" inactive-text="仅展示"></el-switch>
                     </el-form-item>
-                    <el-form-item prop="startTime" label="开售时间">
-                        <el-date-picker
-                            v-model="formData.startTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                        ></el-date-picker>
-                    </el-form-item>
                     <el-form-item class="form-submit">
                         <el-button @click="onSave" :loading="saving" type="primary" v-if="!formData.id">
                             保存

+ 1 - 1
src/main/vue/src/views/CollectionEdit.vue

@@ -274,7 +274,7 @@ export default {
                 type: 'DEFAULT',
                 source: 'OFFICIAL',
                 pic: [],
-                scheduleSale: false,
+                scheduleSale: true,
                 sort: 0,
                 privileges: []
             },