From af25ae6a29b38b1a6ad53dbbebc2da8897757bbd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:09:54 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 4 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 7d6c439..b63101c 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
@@ -15,10 +15,7 @@
import com.xzx.gc.entity.*;
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;
-import com.xzx.gc.shop.vo.ViewOrderVo;
-import com.xzx.gc.shop.vo.XcxOrderListVo;
+import com.xzx.gc.shop.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -246,6 +243,10 @@
scoreDetails.setCurrentScore(remianScore);
scoreDetails.setChangeScore(totalPrice);
scoreDetailsMapper.insert(scoreDetails);
+
+ sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
+ sku.setQuantity(sku.getQuantity() - addGoodsOrderDto.getCnt());
+ scoreGoodsSkuMapper.updateByPrimaryKey(sku);
}
public Long cancelOrder(CancelOrderDto model) {
@@ -264,4 +265,76 @@
List<XcxOrderListVo> data = scoreOrderMapper.selectXcxOrderList(xcxOrderListDto);
return new PageInfo<>(data);
}
+
+ public XcxOrderDetailsVo orderDetails(Long id) {
+ return scoreOrderMapper.selectXcxOrderDetails(id);
+ }
+
+ public void confirmOrder(Long id, String userId) {
+ ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);
+ if (order == null) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!order.getUserId().equals(userId)) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!ScoreOrder.STATUS_ON.equals(order.getStatus())) {
+ throw new RestException(-3, "暂不能确认收货");
+ }
+
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ }
+
+ public void cancelOrder(Long id, String userId) {
+ ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);
+ if (order == null) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!order.getUserId().equals(userId)) {
+ throw new RestException(-3, "订单不存在");
+ }
+
+ if (!ScoreOrder.STATUS_READY.equals(order.getStatus())) {
+ throw new RestException(-3, "订单不能取消");
+ }
+
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_CANCEL, userId);
+
+
+ // 退积分
+ AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(userId);
+ BigDecimal score = new BigDecimal(accountInfo.getCollectScore()).add(order.getTotalPrice()).setScale(0, BigDecimal.ROUND_DOWN);
+
+ ScoreDetails scoreDetails = new ScoreDetails();
+ scoreDetails.setOriginalScore(new BigDecimal(accountInfo.getCollectScore()));
+ scoreDetails.setCurrentScore(score);
+ scoreDetails.setChangeScore(order.getTotalPrice());
+ scoreDetails.setOrderNo(order.getOrderNo());
+ scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);
+ scoreDetails.setCreatedTime(new Date());
+ scoreDetailsMapper.insert(scoreDetails);
+
+ accountInfo.setCollectScore(score.toString());
+ accountInfoMapper.updateByPrimaryKey(accountInfo);
+
+
+
+ // 减销量 加库存
+ List<ScoreOrderDetails> details = scoreOrderDetailsMapper.selectOrderDetailsByOrderId(order.getId());
+ if (CollUtil.isNotEmpty(details)) {
+ for (ScoreOrderDetails detail : details) {
+ ScoreGoodsSku sku = scoreGoodsSkuMapper.selectByPrimaryKey(detail.getSkuId());
+ if (sku == null) {
+ continue;
+ }
+
+ sku.setQuantity(sku.getQuantity() - detail.getCnt());
+ sku.setStock(sku.getStock() + detail.getCnt());
+ scoreGoodsSkuMapper.updateByPrimaryKey(sku);
+ }
+ }
+ }
}
--
Gitblit v1.9.1