From af3e9c24add00f0e66635d37c7973c23e9e1043b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 10:33:12 +0800
Subject: [PATCH] feat(pay): 添加微信支付功能并更新资金流向类型
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 17 +++++++++++++----
src/main/java/cc/mrbird/febs/common/enumerates/ScoreFlowTypeEnum.java | 1 +
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/ScoreFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/ScoreFlowTypeEnum.java
index 1ff3fb0..cd21963 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/ScoreFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/ScoreFlowTypeEnum.java
@@ -6,6 +6,7 @@
public enum ScoreFlowTypeEnum {
+ WECHAT_PAY(16,"微信支付{}"),
WECHAT_REFUND(15,"退款{}到微信"),
REFUND(14, "退款{}到余额"),
/**
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