From 6b2c727379ec8abd93ffcbfdbac3a0fd74676bb9 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 28 Jan 2024 22:23:28 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java | 2 +-
src/test/java/cc/mrbird/febs/ProfitTest.java | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
index 3f3b1fe..1972463 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
@@ -163,6 +163,6 @@
return item.getGainType() == 1 && StrUtil.equals(data.getValue(), todayTime);
}).max(Comparator.comparing(MallVipBenefits::getScoreMultiple));
- return max.orElseGet(max::get);
+ return max.orElse(null);
}
}
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
index 3f9ddf9..1693591 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java
@@ -64,7 +64,7 @@
int score = multiple.multiply(BigDecimal.valueOf(sum)).intValue();
mallMoneyFlowService.addMoneyFlow(memberId, new BigDecimal(score), ScoreFlowTypeEnum.BUY.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), name, 2);
- mallMemberWalletService.add(new BigDecimal(score), memberId, "prize_score");
+ mallMemberWalletService.add(new BigDecimal(score), memberId, "prizeScore");
}
@Override
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index a5722e7..bc26aac 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -970,6 +970,7 @@
@Test
public void aaaTest() {
- agentConsumer.vipLevelUp(133L);
+// agentConsumer.vipLevelUp(133L);
+ agentConsumer.getScoreMsg(152L);
}
}
--
Gitblit v1.9.1