From b9857b9a19ae585d342b74fca6ee26277019e65c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 18:02:58 +0800
Subject: [PATCH] 20210630 积分拨付
---
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 1ae3967..2e16113 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
@@ -168,9 +168,10 @@
BigDecimal totalScore = BigDecimal.ZERO;
for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
- BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
+ BigDecimal weight = StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO;
+ BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(weight);
orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
- orderItem.setWeight(StrUtil.isNotBlank(item.getWeight()) ? new BigDecimal(item.getWeight()) : BigDecimal.ZERO);
+ orderItem.setWeight(weight);
jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
totalScore = totalScore.add(total);
@@ -201,7 +202,8 @@
BigDecimal userScore = StrUtil.isBlank(userAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(userAccount.getCollectScore());
ScoreDetails userScoreDetail = new ScoreDetails();
userScoreDetail.setOrderNo(order.getOrderNo());
- userScoreDetail.setUserId(order.getJhyId());
+// userScoreDetail.setUserId(order.getJhyId());
+ userScoreDetail.setUserId(order.getUserId());
userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
userScoreDetail.setChangeScore(totalScore);
userScoreDetail.setOriginalScore(userScore);
--
Gitblit v1.9.1