From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 0f0aa3e..e6ff8d5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -427,10 +427,11 @@
hasSignQuery.eq(MallScoreSignRecord::getMemberId, member.getId());
List<MallScoreSignRecord> hasSignTotalList = mallScoreSignRecordMapper.selectList(hasSignQuery);
if (CollUtil.isNotEmpty(hasSignTotalList)) {
- int totalScore = hasSignTotalList.stream().mapToInt(MallScoreSignRecord::getTotalCnt).sum();
+ int totalScore = hasSignTotalList.stream().mapToInt(MallScoreSignRecord::getScore).sum();
if (totalScore + mallScoreSignRecord.getScore() > scoreSetting.getMostSignIn()) {
- throw new FebsException("达到当月积分上限");
+// throw new FebsException("达到当月积分上限");
+ mallScoreSignRecord.setScore(scoreSetting.getMostSignIn() - totalScore);
}
}
--
Gitblit v1.9.1