From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index eecba39..44e9640 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -167,6 +167,17 @@
if (goods == null || ScoreGoods.ISSALE_NO.equals(goods.getIsSale())) {
throw new RestException(-3, "商品不存在或已下架");
}
+
+ if (ScoreGoods.ISQG_YES.equals(goods.getIsQg())) {
+ if (new Date().before(goods.getQgStartTime())) {
+ throw new RestException(-3, "抢购未开始");
+ }
+
+ if (new Date().after(goods.getQgEndTime())) {
+ throw new RestException(-3, "抢购已结束");
+ }
+ }
+
AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
if (accountInfo.getCollectScore() == null) {
--
Gitblit v1.9.1