From 9fef5e91afa0073f95dd203159b5eccf68555536 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 19 Aug 2025 11:20:12 +0800
Subject: [PATCH] refactor(mall): 修改 WxxcxJob 类的条件加载配置- 将 @ConditionalOnProperty 注解的 havingValue 属性从 "true" 改为 "false"- 此修改改变了 WxxcxJob 类的加载条件，根据配置项 system.job 的值来决定是否加载该类
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
index b4722f6..9246e4e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
@@ -152,7 +152,7 @@
DataDictionaryEnum.WIN_CASH.getCode());
String scoreDicValue = scoreDic.getValue() == null? "0":scoreDic.getValue();
String cashDicValue = cashDic.getValue() == null? "0":cashDic.getValue();
- BigDecimal totalProbability = new BigDecimal(scoreDicValue).add(new BigDecimal(cashDicValue));
+ BigDecimal totalProbability = new BigDecimal(scoreDicValue).multiply(new BigDecimal(cashDicValue));
//获取那个更大一点的几率
BigDecimal maxProbability = BigDecimal.ZERO;
BigDecimal minProbability = BigDecimal.ZERO;
@@ -578,10 +578,10 @@
mallMoneyFlowService.addMoneyFlow(
wallet.getMemberId(),
prize,
- ScoreFlowTypeEnum.LUCKY_DRAW.getValue(),
+ ScoreFlowTypeEnum.LUCKY_DRAW_SCORE.getValue(),
MallUtils.getOrderNum(),
FlowTypeEnum.PRIZE_SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW.getDesc(),prize),
+ StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW_SCORE.getDesc(),apiMallAwardDetailsVo.getAwardName()),
2
);
} else if (apiMallAwardDetailsVo.getAwardType() == 2) {
@@ -592,7 +592,7 @@
ScoreFlowTypeEnum.LUCKY_DRAW_COMMISSION.getValue(),
MallUtils.getOrderNum(),
FlowTypeEnum.COMMISSION.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW_COMMISSION.getDesc(),prize),
+ StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW_COMMISSION.getDesc(),apiMallAwardDetailsVo.getAwardName()),
2
);
}
--
Gitblit v1.9.1