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 | 9 +++++++--
1 files changed, 7 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 d2e22eb..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
@@ -274,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);
@@ -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