From 92c26cea4de00349b346f71da3cf530b26c31eb0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 10 Jun 2025 09:40:59 +0800
Subject: [PATCH] fix(mall): 修复用户重复加入标签的问题

---
 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