From 5f78dc66dedd434046bea12519e92982d47ce932 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 6 Aug 2019 10:30:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E6=88=90=E9=95=BF=E5=80=BC]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E8=BE=BE=E5=88=B0=E9=97=A8=E9=99=90?= =?UTF-8?q?=E5=80=BC=E6=89=8D=E7=BB=99=E7=A7=AF=E5=88=86=E6=88=90=E9=95=BF?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCreditHistoryServiceImpl.java | 11 ++++++++--- .../service/impl/WxScoreRulesServiceImpl.java | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 2320f4ed3..e81e7d23b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -402,9 +402,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 // 4. 计算积分 - Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore); - addCreditNumber = dScoreT.intValue(); - log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: " + addCreditNumber); + if(record.getSpend() >= priceCondition.intValue()) { + Double dScoreT = Math.floor(record.getSpend() * 1.0D / priceCondition * baseScore); + addCreditNumber = dScoreT.intValue(); + log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: " + addCreditNumber); + } else { + log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: 0, not touch credit limit"); + return 0; + } return addCreditNumber; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 7fcd0141f..e44559cc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -320,9 +320,14 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 // 4. 计算成长值 - Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore); - addScoreNumber = dScoreT.intValue(); - logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber); + if(order.getPayment() >= priceCondition.intValue()) { + Double dScoreT = Math.floor(order.getPayment() * 1.0D / priceCondition * baseScore); + addScoreNumber = dScoreT.intValue(); + logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber); + } else { + logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: 0, not touch score limit"); + return 0; + } // 5. 增长的成长值 updateScore(order.getCUserId(), addScoreNumber);