From 4d1635e73a1555bb9bf83f43ebbad3ef01d34df1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 10:16:24 +0800
Subject: [PATCH] 组合支付

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 8494349..4605836 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
@@ -427,7 +427,7 @@
                 }
                 wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataThree);
                 payResultStr = brandWCPayRequestDataThree.getPrepay_id();
-                orderInfo.setPayMethod("微信支付");
+                orderInfo.setPayMethod("余额加微信");
                 amountActualMsg = amountThree.toString();
                 break;
             /**
@@ -465,6 +465,8 @@
                 mallMoneyFlowService.addMoneyFlow(member.getId(), amountActualOne.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                         orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                 amountActualMsg = amountActualOne.toString();
+
+                orderInfo.setPayMethod("积分加余额");
                 mallMoneyFlowService.addMoneyFlow(member.getId(), scoreOne.negate(),
                         MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
                 break;
@@ -501,7 +503,7 @@
                 }
                 wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataTwo);
                 payResultStr = brandWCPayRequestDataTwo.getPrepay_id();
-                orderInfo.setPayMethod("微信支付");
+                orderInfo.setPayMethod("积分加微信");
                 amountActualMsg = amountActualTwo.toString();
                 break;
             default:

--
Gitblit v1.9.1