From 3a0ee38375a0fdf95ef734fa420030203ee31abd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 17:08:30 +0800
Subject: [PATCH] 赠送积分更新状态

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 72c3c08..f9861df 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -407,12 +407,12 @@
                 BigDecimal balanceThree = mallMemberWalletThree.getBalance();
                 BigDecimal amountThree = orderInfo.getAmount();
 
-                int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
-                if (reduceThree == 2) {
-                    throw new FebsException("余额不足");
-                }
-                mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
-                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
+//                int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
+//                if (reduceThree == 2) {
+//                    throw new FebsException("余额不足");
+//                }
+//                mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
+//                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
 
                 //实际支付余额
                 BigDecimal amountActualThree = amountThree.subtract(balanceThree).setScale(2, BigDecimal.ROUND_DOWN);
@@ -427,6 +427,7 @@
                 wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataThree);
                 payResultStr = brandWCPayRequestDataThree.getPrepay_id();
                 orderInfo.setPayMethod("余额加微信");
+                orderInfo.setAmount(amountThree);
                 amountActualMsg = amountThree.toString();
                 break;
             /**

--
Gitblit v1.9.1