From fd345592daef5f203af84eeb4fa33fd989a2ba66 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 四月 2025 10:55:45 +0800
Subject: [PATCH] 大屏修改

---
 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 186c541..3299b4d 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
@@ -242,7 +242,7 @@
         withdraw.setUserId(userId);
         withdraw.setUserPhone(userPhone);
         withdraw.setApplyForTime(new Date());
-        withdraw.setApplyForMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
+        withdraw.setApplyForMoney(order.getOrderMoney());
         withdraw.setOrderId(orderId);
         withdraw.setCityCode(order.getCityCode());
 
@@ -252,7 +252,7 @@
             // 已通过
             withdraw.setState(Constants.ONE);
             // 商家微信打款至微信零钱
-            boolean update = weChatPay(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
+            boolean update = weChatPay(order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
 //            if (!update) {
 //                throw new GlobalException("交易提现失败,请检查是否绑定微信!");
 //            }
@@ -394,7 +394,7 @@
                     JSONObject.toJSONString(postMap),
                     "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                     "1665330417",
-                    "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
+                    "D://apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
             JSONObject jsonObject = JSONObject.parseObject(result);
 //            WithdrawDetail withdrawDetail = new WithdrawDetail();
 //            withdrawDetail.setWithdrawId(withdrawId);

--
Gitblit v1.7.1