From 78e1837458da467cacefa8e22c2c9616b1dc9f9d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:26:58 +0800
Subject: [PATCH] refactor(mall): 优化积分和余额支付流程
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 95d834f..65239cf 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
@@ -546,7 +546,15 @@
//先支付积分部分
if(orderInfo.getScoreAmount().compareTo(BigDecimal.ZERO) > 0){
balanceScorePay(orderInfo, payOrderDto.getTradePwd(), "prizeScore");
- mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), ScoreFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue(), null, 2);
+ mallMoneyFlowService.addMoneyFlow(
+ member.getId(),
+ orderInfo.getAmount().negate(),
+ ScoreFlowTypeEnum.PAY.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.PAY.getDesc(),orderInfo.getScoreAmount()),
+ 2
+ );
}
String payResultStr = "";
@@ -592,8 +600,15 @@
orderInfo.setPayResult("1");
orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
- mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
-
+ mallMoneyFlowService.addMoneyFlow(
+ member.getId(),
+ orderInfo.getAmount().negate(),
+ ScoreFlowTypeEnum.PAY_BALANCE.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.BALANCE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.PAY_BALANCE.getDesc(),orderInfo.getScoreAmount()),
+ 2
+ );
agentProducer.sendOrderCoupon(orderInfo.getId());
break;
case "4":
--
Gitblit v1.9.1