From 04ff0392849be2bcddba6747679790b0bce464fb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 14:07:34 +0800
Subject: [PATCH] refactor(mall): 调整订单相关功能和界面

---
 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 32b7304..79aa3c3 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -342,11 +342,20 @@
                             mallMoneyFlowService.addMoneyFlow(
                                     order.getMemberId(),
                                     order.getAmount().negate(),
-                                    MoneyFlowTypeEnum.WECHAT_PAY.getValue(),
+                                    ScoreFlowTypeEnum.WECHAT_PAY.getValue(),
                                     order.getOrderNo(),
-                                    FlowTypeEnum.WECHAT.getValue(),
-                                    "微信支付",
-                                    2);
+                                    FlowTypeEnum.BALANCE.getValue(),
+                                    StrUtil.format(ScoreFlowTypeEnum.WECHAT_PAY.getDesc(),order.getAmount()),
+                                    2
+                            );
+//                            mallMoneyFlowService.addMoneyFlow(
+//                                    order.getMemberId(),
+//                                    order.getAmount().negate(),
+//                                    MoneyFlowTypeEnum.WECHAT_PAY.getValue(),
+//                                    order.getOrderNo(),
+//                                    FlowTypeEnum.WECHAT.getValue(),
+//                                    "微信支付",
+//                                    2);
                             threadResult.success().message("支付成功");
                         } else {
                             log.info("订单状态不为待付款,order status=", order.getStatus());

--
Gitblit v1.9.1