From 9f7d11df8c82fedb6bb2c83f99b52da08e75de3c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 03 Jul 2021 17:55:21 +0800
Subject: [PATCH] fix shoporder
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 225fd6b..27a6e0e 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -155,7 +155,12 @@
throw new RestException(-3, "无权限操作");
}
- order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+ if (userId.equals(order.getJhyId())) {
+ order.setStatus(JhyOrder.ORDER_STATUS_WAITING);
+ } else {
+ order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
+ }
+
jhyOrderMapper.updateByPrimaryKey(order);
}
@@ -193,13 +198,13 @@
jhyScoreDetail.setOrderNo(order.getOrderNo());
jhyScoreDetail.setUserId(order.getJhyId());
jhyScoreDetail.setType(ScoreDetails.SCORE_TYPE_PAY);
- jhyScoreDetail.setChangeScore(totalScore.negate());
- jhyScoreDetail.setOriginalScore(jhyScore);
- jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore));
+ jhyScoreDetail.setChangeScore(totalScore.negate().setScale( 0, BigDecimal.ROUND_DOWN ));
+ jhyScoreDetail.setOriginalScore(jhyScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
jhyScoreDetail.setCreatedTime(new Date());
scoreDetailsMapper.insert(jhyScoreDetail);
- jhyAccount.setCollectScore(jhyScore.subtract(totalScore).toString());
+ jhyAccount.setCollectScore(jhyScore.subtract(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
accountMapper.updateByPrimaryKey(jhyAccount);
AccountInfo userAccount = accountMapper.selectAccountInfoByUserId(order.getUserId());
@@ -209,13 +214,13 @@
// userScoreDetail.setUserId(order.getJhyId());
userScoreDetail.setUserId(order.getUserId());
userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
- userScoreDetail.setChangeScore(totalScore);
- userScoreDetail.setOriginalScore(userScore);
- userScoreDetail.setCurrentScore(userScore.add(totalScore));
+ userScoreDetail.setChangeScore(totalScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ userScoreDetail.setOriginalScore(userScore.setScale( 0, BigDecimal.ROUND_DOWN ));
+ userScoreDetail.setCurrentScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ));
userScoreDetail.setCreatedTime(new Date());
scoreDetailsMapper.insert(userScoreDetail);
- userAccount.setCollectScore(userScore.add(totalScore).toString());
+ userAccount.setCollectScore(userScore.add(totalScore).setScale( 0, BigDecimal.ROUND_DOWN ).toString());
accountMapper.updateByPrimaryKey(userAccount);
}
}
--
Gitblit v1.9.1