白名单

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

@@ -185,6 +185,13 @@ public class OrderService {
             //查询是否有拉新任务，只算官方购买
             int usePoint = 0;
             if (collection.getSource() != CollectionSource.TRANSFER && collection.getAssignment() > 0) {
+                //延迟销售
+                if (collection.getTimeDelay()){
+                    if (collection.getSaleTime().isAfter(LocalDateTime.now())) {
+                        throw new BusinessException("当前还未开售");
+                    }
+                }
+
                 if (vip) {
                     int purchase = orderRepo.countByUserIdAndCollectionIdAndVipTrueAndStatusIn(userId, collectionId, Arrays.asList(OrderStatus.FINISH, OrderStatus.NOT_PAID, OrderStatus.PROCESSING));
                     if (vipPurchase - purchase <= 0) {

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

@@ -179,6 +179,7 @@
                         <el-radio v-model="formData.onShelf" :label="true">是</el-radio>
                         <el-radio v-model="formData.onShelf" :label="false">否</el-radio>
                     </el-form-item>
+
                     <div class="inline-wrapper">
                         <el-form-item prop="startTime" label="定时发布">
                             <el-radio v-model="formData.scheduleSale" :label="true">是</el-radio>
@@ -198,6 +199,7 @@
                             ></el-date-picker>
                         </el-form-item>
                     </div>
+
                     <el-form-item
                         prop="salable"
                         label="可售"
@@ -234,22 +236,54 @@
                             <el-radio :label="false">支付宝/微信</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item prop="assignment" label="拉新任务指标">
-                        <el-input-number
-                            type="number"
-                            :min="0"
-                            :step="1"
-                            :max="5"
-                            v-model="formData.assignment"
-                        ></el-input-number>
-                        <div class="tip">0表示无拉新任务限制</div>
-                    </el-form-item>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="assignment" label="拉新任务指标">
+                            <el-input-number
+                                type="number"
+                                :min="0"
+                                :step="1"
+                                :max="5"
+                                v-model="formData.assignment"
+                            ></el-input-number>
+                            <div class="tip">0表示无拉新任务限制</div>
+                        </el-form-item>
+                        <el-form-item prop="vipQuota" label="白名单额度" v-if="formData.assignment > 0">
+                            <el-input-number
+                                type="number"
+                                :min="0"
+                                :step="1"
+                                v-model="formData.vipQuota"
+                            ></el-input-number>
+                            <div class="tip">拉新可以获得积分的额度</div>
+                        </el-form-item>
+                    </div>
+                    <div class="inline-wrapper">
+                        <el-form-item prop="timeDelay" label="延迟销售" v-if="formData.assignment > 0">
+                            <el-radio v-model="formData.timeDelay" :label="true">是</el-radio>
+                            <el-radio v-model="formData.timeDelay" :label="false">否</el-radio>
+                        </el-form-item>
+                        <el-form-item
+                            prop="saleTime"
+                            label="销售时间"
+                            v-if="formData.assignment > 0 && formData.timeDelay"
+                            style="margin-left: 22px"
+                        >
+                            <el-date-picker
+                                v-model="formData.saleTime"
+                                type="datetime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="销售时间"
+                            ></el-date-picker>
+                        </el-form-item>
+                    </div>
+
                     <el-form-item label="分享海报" v-if="formData.assignment > 0">
                         <single-upload v-model="formData.shareBg"></single-upload>
                     </el-form-item>
                     <el-form-item label="注册海报" v-if="formData.assignment > 0">
                         <single-upload v-model="formData.registerBg"></single-upload>
                     </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">
@@ -676,4 +710,7 @@ export default {
         display: inline-block;
     }
 }
+.right-margin {
+    margin-left: 50px;
+}
 </style>