From 82d3dbcde826b7b8b38382e7bd34c011e38a34d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 30 Jun 2021 19:23:43 +0800
Subject: [PATCH] 20210630 积分拨付
---
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java | 10 +++++-----
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 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..290ded6 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
@@ -193,13 +193,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 +209,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);
}
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
index ceb0fcb..b803ccc 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java
@@ -119,7 +119,7 @@
List<AccountInfo> accountInfos = accountMapper.selectByExample(exampleAccount);
if(CollUtil.isNotEmpty(accountInfos)){
AccountInfo accountInfo = accountInfos.get(0);
- Integer collectScore = Integer.parseInt(StrUtil.isEmpty(accountInfo.getCollectScore())?"0":accountInfo.getCollectScore());
+ String collectScore = StrUtil.isEmpty(accountInfo.getCollectScore())?"0":accountInfo.getCollectScore();
// collectScore = collectScore + model.getScore();
accountInfo.setCollectScore(model.getScore().toString());
accountMapper.updateByPrimaryKey(accountInfo);
@@ -127,9 +127,9 @@
ScoreDetails scoreDetailsRet = new ScoreDetails();
scoreDetailsRet.setUserId(model.getUserId());
scoreDetailsRet.setType(ScoreDetails.SCORE_TYPE_ADMIN_RECHARGE);
- scoreDetailsRet.setOriginalScore(new BigDecimal(collectScore));
- scoreDetailsRet.setCurrentScore(new BigDecimal(model.getScore()));
- scoreDetailsRet.setChangeScore(new BigDecimal(model.getScore()));
+ scoreDetailsRet.setOriginalScore(new BigDecimal(collectScore).setScale( 0, BigDecimal.ROUND_DOWN ));
+ scoreDetailsRet.setCurrentScore(new BigDecimal(model.getScore()).setScale( 0, BigDecimal.ROUND_DOWN ));
+ scoreDetailsRet.setChangeScore(new BigDecimal(model.getScore()).setScale( 0, BigDecimal.ROUND_DOWN ));
scoreDetailsRet.setCreatedTime(new Date());
accountMapper.insertScoreDetailsRet(scoreDetailsRet);
}
@@ -143,7 +143,7 @@
List<AccountInfo> accountInfos = accountMapper.selectByExample(exampleAccount);
if(CollUtil.isNotEmpty(accountInfos)){
AccountInfo accountInfo = accountInfos.get(0);
- getScoreNumVo.setScore(new BigDecimal(StrUtil.isEmpty(accountInfo.getCollectScore())?"0":accountInfo.getCollectScore()));
+ getScoreNumVo.setScore(new BigDecimal(StrUtil.isEmpty(accountInfo.getCollectScore())?"0":accountInfo.getCollectScore()).setScale( 0, BigDecimal.ROUND_DOWN ));
}
return getScoreNumVo;
}
--
Gitblit v1.9.1