From bb5a5bdc383f40d3338aa50cc921a74d79d0023b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 16:39:56 +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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 b31e711..f0f17d6 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
@@ -174,8 +174,13 @@
}
public Long insureOrder(InsureOrderDto model) {
+ long id = model.getId();
+ ScoreOrder scoreOrderBefore = scoreOrderMapper.selectByPrimaryKey(id);
ScoreOrder scoreOrder = new ScoreOrder();
scoreOrder.setId(model.getId());
+ if(ScoreOrder.STATUS_DOING == scoreOrderBefore.getStatus()){
+ scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
+ }
// scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
scoreOrder.setIsFinish(ScoreOrder.ISFINISH_YES);
scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
@@ -236,6 +241,7 @@
orderDetails.setTotalPrice(totalPrice);
orderDetails.setUnitPrice(sku.getPresentPrice());
orderDetails.setGoodsId(goods.getId());
+ orderDetails.setSkuId(sku.getId());
orderDetails.setThumb(goods.getThumb());
scoreOrderDetailsMapper.insert(orderDetails);
@@ -269,12 +275,12 @@
scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);
scoreDetails.setOriginalScore(score);
scoreDetails.setCurrentScore(remianScore);
- scoreDetails.setChangeScore(totalPrice);
+ scoreDetails.setChangeScore(totalPrice.negate());
scoreDetails.setCreatedTime(new Date());
scoreDetailsMapper.insert(scoreDetails);
sku.setStock(sku.getStock() - addGoodsOrderDto.getCnt());
- sku.setQuantity(sku.getQuantity() - addGoodsOrderDto.getCnt());
+ sku.setQuantity(sku.getQuantity() + addGoodsOrderDto.getCnt());
scoreGoodsSkuMapper.updateByPrimaryKey(sku);
}
--
Gitblit v1.9.1