From 1cc585091b57b6824c710fbe8a620559a8f1e286 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 02 Jul 2021 15:56:19 +0800
Subject: [PATCH] delete application-xctest.yml
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 33cc93a..155d6bb 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(),","));
@@ -206,15 +211,12 @@
}
AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
- log.info("积分:{}", accountInfo.getCollectScore());
if (accountInfo.getCollectScore() == null) {
throw new RestException(-3, "积分不足");
}
BigDecimal totalPrice = sku.getPresentPrice().multiply(BigDecimal.valueOf(addGoodsOrderDto.getCnt()));
BigDecimal score = new BigDecimal(accountInfo.getCollectScore());
- log.info("积分:{}", score);
- log.info("积分1:{}", totalPrice);
if (score.compareTo(totalPrice) < 0) {
throw new RestException(-3, "积分不足");
}
@@ -272,7 +274,7 @@
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);
@@ -355,7 +357,12 @@
throw new RestException(-3, "暂不能确认收货");
}
- scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) {
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId);
+ } else {
+ scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
+ }
+
}
public void cancelOrder(Long id, String userId) {
--
Gitblit v1.9.1