Merge branch 'dev' of http://git.izouma.com/xiongzhu/9th into dev

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

@@ -52,4 +52,6 @@ public class UserCoupon extends BaseEntity {
     @ApiModelProperty("使用时间")
     private LocalDateTime useTime;
 
+    private int projectId;
+
 }

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

@@ -96,7 +96,11 @@ public class OrderService {
                 throw new BusinessException("该兑换券不可用");
             }
         }
-
+        if (collection.isScheduleSale()) {
+            if (collection.getStartTime().isAfter(LocalDateTime.now())) {
+                throw new BusinessException("当前还未开售");
+            }
+        }
         if (!collection.isOnShelf()) {
             throw new BusinessException("藏品已下架");
         }

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

@@ -5,6 +5,10 @@ import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.service.AssetService;
 import com.izouma.nineth.service.GiftOrderService;
 import com.izouma.nineth.service.OrderService;
@@ -30,6 +34,7 @@ public class OrderPayController {
     private final AssetService     assetService;
     private final WxMpService      wxMpService;
     private final GiftOrderService giftOrderService;
+    private final OrderRepo        orderRepo;
 
     @RequestMapping(value = "/alipay_h5", method = RequestMethod.GET)
     @ResponseBody
@@ -39,6 +44,10 @@ public class OrderPayController {
 
     @RequestMapping(value = "/alipay_wx", method = RequestMethod.GET)
     public String payOrderAlipayWx(Long id, Model model) throws BaseAdaPayException {
+        Order order = orderRepo.findById(id).orElseThrow(new BusinessException("订单不存在"));
+        if (order.getStatus() != OrderStatus.NOT_PAID) {
+            return "redirect:/9th/store";
+        }
         String payUrl = (String) orderService.payAdapay(id, "alipay_wap", null);
         model.addAttribute("payUrl", payUrl);
         model.addAttribute("orderId", id);

src/main/vue/src/views/BannerEdit.vue

@@ -20,6 +20,7 @@
                         <el-select v-model="formData.projectId">
                             <el-option :value="0" label="第九空间"></el-option>
                             <el-option :value="1" label="cosmos art"></el-option>
+                            <el-option :value="2" label="modern point"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item prop="name" label="名称">

src/main/vue/src/views/InviteEdit.vue

@@ -24,8 +24,14 @@
                     </el-form-item>
                     <el-form-item prop="code" label="邀请码">
                         <div>
-                            <el-input v-model="formData.code" style="width: calc(100% - 100px)"></el-input>
-                            <el-button style="margin-left: 15px" @click="random">随机生成</el-button>
+                            <el-input
+                                v-model="formData.code"
+                                style="width: calc(100% - 100px)"
+                                :disabled="formData.inviteNum > 0"
+                            ></el-input>
+                            <el-button style="margin-left: 15px" @click="random" :disabled="formData.inviteNum > 0"
+                                >随机生成</el-button
+                            >
                         </div>
                     </el-form-item>
                     <el-form-item prop="remark" label="备注">