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 | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 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 17aff9f..79aa3c3 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -23,6 +23,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -320,17 +321,41 @@
order.setPayOrderNo(transaction_id);
mallOrderInfoMapper.updateById(order);
+
+ //先支付积分部分
+ if(order.getScoreAmount().compareTo(BigDecimal.ZERO) > 0){
+ memberWalletService.reduce(order.getScoreAmount(), order.getMemberId(), "prizeScore");
+ mallMoneyFlowService.addMoneyFlow(
+ order.getMemberId(),
+ order.getScoreAmount().negate(),
+ ScoreFlowTypeEnum.PAY.getValue(),
+ order.getOrderNo(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.PAY.getDesc(),order.getScoreAmount()),
+ 2
+ );
+ }
+
agentProducer.sendOrderCoupon(order.getId());
// agentProducer.sendGetScoreMsg(order.getId());
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