From 80fc7ebdc30b498025db8ebbdb3e63806d5926d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 10:15:15 +0800
Subject: [PATCH] bug 修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
index db7637d..186c541 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
@@ -138,7 +138,7 @@
throw new GlobalException("当前订单提现申请已通过！");
}
- return weChatPay(order.getOrderMoney(), openId,list.get(0).getId(),order.getServeName());
+ return weChatPay(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney(), openId,list.get(0).getId(),order.getServeName());
}
@Override
@@ -242,7 +242,7 @@
withdraw.setUserId(userId);
withdraw.setUserPhone(userPhone);
withdraw.setApplyForTime(new Date());
- withdraw.setApplyForMoney(order.getOrderMoney());
+ withdraw.setApplyForMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
withdraw.setOrderId(orderId);
withdraw.setCityCode(order.getCityCode());
@@ -252,7 +252,7 @@
// 已通过
withdraw.setState(Constants.ONE);
// 商家微信打款至微信零钱
- boolean update = weChatPay(order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
+ boolean update = weChatPay(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
// if (!update) {
// throw new GlobalException("交易提现失败，请检查是否绑定微信！");
// }
--
Gitblit v1.7.1