From d7064002eea6b2bc49e1a4f74f8b6b45d91f0026 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 17:51:32 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 f770ac5..8cb02dd 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
@@ -12,10 +12,7 @@
import com.xzx.gc.common.exception.RestException;
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.*;
-import com.xzx.gc.shop.dto.AddGoodsOrderDto;
-import com.xzx.gc.shop.dto.DeliverGoodsDto;
-import com.xzx.gc.shop.dto.InsureOrderDto;
-import com.xzx.gc.shop.dto.QueryOrderListDto;
+import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.ExpressInfoVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
@@ -163,6 +160,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) {
@@ -218,11 +226,9 @@
expressInfo.setCreatedTime(new Date());
scoreExpressInfoMapper.insert(expressInfo);
- AccountInfo update = new AccountInfo();
- update.setAccountId(accountInfo.getAccountId());
- BigDecimal remianScore = score.subtract(totalPrice);
- update.setCollectScore(remianScore.toString());
- accountInfoMapper.updateByPrimaryKey(update);
+ BigDecimal remianScore = score.subtract(totalPrice).setScale(0, BigDecimal.ROUND_DOWN);
+ accountInfo.setCollectScore(remianScore.toString());
+ accountInfoMapper.updateByPrimaryKey(accountInfo);
ScoreDetails scoreDetails = new ScoreDetails();
scoreDetails.setOrderNo(order.getOrderNo());
@@ -233,4 +239,15 @@
scoreDetails.setChangeScore(totalPrice);
scoreDetailsMapper.insert(scoreDetails);
}
+
+ public Long cancelOrder(CancelOrderDto model) {
+ /**
+ * todo 只更新了订单状态，后续操作待增加
+ */
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(model.getId());
+ scoreOrder.setStatus(ScoreOrder.STATUS_CANCEL);
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ return scoreOrder.getId();
+ }
}
--
Gitblit v1.9.1