From cb9d40e12c5c51397e8a86c89b113b12becd48a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 03 Jul 2021 18:04:33 +0800
Subject: [PATCH] fix jhy range
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 d2e22eb..8673f65 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
@@ -274,12 +274,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);
}
@@ -357,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