From 929bbd74135fd867537adc18a171491b83679090 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 20 Apr 2023 15:47:57 +0800
Subject: [PATCH] 店铺列表

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 78626ce..6c90350 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
@@ -108,6 +108,7 @@
         MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
         apiScoreVoucherInfoVo.setVoucherCnt(mallMemberWallet.getVoucherCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherCnt());
         apiScoreVoucherInfoVo.setVoucherAmount(mallMemberWallet.getVoucherAmount().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherAmount());
+        apiScoreVoucherInfoVo.setVoucherFireCnt(mallMemberWallet.getVoucherFireCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherFireCnt());
         DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                 GreenScoreEnum.SCORE_PRICE.getType(),
                 GreenScoreEnum.SCORE_PRICE.getCode());
@@ -173,7 +174,9 @@
         scorePoolCntDic.setValue(scorePoolCnt.toString());
         dataDictionaryCustomMapper.updateById(scorePoolCntDic);
         //增加凭证数量
-        mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
+//        mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
+        //增加凭证燃烧值数量
+        mallMemberWalletMapper.addVorCherFireCntByMemberId(voucherCnt,memberId);
         //增加购买记录
         String voucherNo = MallUtils.getOrderNum("VB");
         MallScoreVoucher mallScoreVoucher = new MallScoreVoucher();
@@ -220,7 +223,7 @@
         MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
         BigDecimal voucherCntMember = mallMemberWallet.getVoucherCnt();
         if(voucherCntMember.compareTo(voucherCnt) < 0){
-            throw new FebsException("绿色积分不足");
+            throw new FebsException("数量不足");
         }
 
         DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -257,7 +260,7 @@
                 voucherAmount,
                 MoneyFlowTypeEnum.VOUCHER_SALE.getValue(),
                 voucherNo,
-                FlowTypeEnum.VOUCHER_AMOUNT.getValue());
+                FlowTypeEnum.BALANCE.getValue());
         return new FebsResponse().success().message("操作成功");
     }
 

--
Gitblit v1.9.1