From 17a07481c3292e6fcbc7fff3dcbeb8ae817c178c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Jul 2021 16:16:24 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
index 8eb7151..1c30613 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/DistribService.java
@@ -86,7 +86,7 @@
if (StrUtil.isNotBlank(value) && !"0".equals(value)) {
// 首单完成后，在value单内，返利积分或者环保币
- if (count - 1 <= Integer.parseInt(value)) {
+ if (count - 1 < Integer.parseInt(value)) {
String scoreStr = getRuleValue(redPaperRule, CommonEnum.返利固定积分.getValue());
String coinStr = getRuleValue(redPaperRule, CommonEnum.返利环保币比例.getValue());
// 根据积分返利固定积分
@@ -132,7 +132,6 @@
userHeadRelate.setScore(userHeadRelate.getScore().add(totalReturnScore));
userHeadRelateMapper.updateByPrimaryKey(userHeadRelate);
- accountInfo.setAccountId(accountInfo.getAccountId());
accountInfo.setMoney(new BigDecimal(accountInfo.getMoney()).add(totalReturnCoin).setScale(2, BigDecimal.ROUND_DOWN).toString());
BigDecimal collectScore = StrUtil.isNotBlank(accountInfo.getCollectScore()) ? new BigDecimal(accountInfo.getCollectScore()) : BigDecimal.ZERO;
accountInfo.setCollectScore(collectScore.add(totalReturnScore).setScale(0, BigDecimal.ROUND_DOWN).toString());
--
Gitblit v1.9.1