From 217d376af5ae8ba2df481e52e3801684f56d2bda Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Jun 2022 18:38:46 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 6dc0050..42a9dbf 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
@@ -549,11 +549,19 @@
 //        wallet.setCommission(commission);
 //        mallMemberWalletMapper.updateAmountWithVersion(wallet);
 
+        // 消耗积分
         BigDecimal useScore = new BigDecimal(actScoreCnt);
         mallMemberWalletService.reduce(useScore, wallet.getMemberId(), "prizeScore");
-        mallMemberWalletService.add(commission, wallet.getMemberId(), "commission");
         mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), useScore.negate(), MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
-        mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), commission, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+
+        BigDecimal prize = new BigDecimal(apiMallAwardDetailsVo.getAwardValue());
+        if (apiMallAwardDetailsVo.getAwardType() == 1) {
+            mallMemberWalletService.add(prize, wallet.getMemberId(), "prizeScore");
+            mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), prize, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
+        } else if (apiMallAwardDetailsVo.getAwardType() == 2) {
+            mallMemberWalletService.add(prize, wallet.getMemberId(), "commission");
+            mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), prize, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+        }
         return apiMallAwardDetailsVo;
     }
 

--
Gitblit v1.9.1