From 89351ad17c81b37495f21d4dfbf28f0d306a155a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:23:05 +0800
Subject: [PATCH] 虚拟号修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 8c87354..d246d2d 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
@@ -14,16 +14,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.vo.UserDto;
import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.order.entity.Order;
-import com.ruoyi.order.entity.Withdraw;
-import com.ruoyi.order.entity.WithdrawDetail;
-import com.ruoyi.order.entity.WithdrawalSetting;
+import com.ruoyi.order.entity.*;
import com.ruoyi.order.mapper.WithdrawMapper;
import com.ruoyi.order.request.WithdrawExportRequest;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.WithdrawDetailService;
-import com.ruoyi.order.service.WithdrawService;
-import com.ruoyi.order.service.WithdrawalSettingService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.MoneyQueryRequest;
import com.ruoyi.order.vo.UserWithdrawRecordVO;
import com.ruoyi.order.vx.HttpUtil;
@@ -56,6 +50,8 @@
@Resource
private WithdrawalSettingService withdrawalSettingService;
+ @Resource
+ private WithdrawRecordService withdrawRecordService;
@Resource
private OrderService orderService;
@Resource
@@ -245,17 +241,25 @@
withdraw.setApplyForMoney(order.getOrderMoney());
withdraw.setOrderId(orderId);
withdraw.setCityCode(order.getCityCode());
-
this.save(withdraw);
+ WithdrawRecord withdrawRecord = new WithdrawRecord();
+ withdrawRecord.setWithdrawId(withdraw.getId());
+ withdrawRecord.setOrderId(withdraw.getOrderId());
+ withdrawRecord.setUserId(withdraw.getUserId());
+ withdrawRecord.setWithdrawType(1);
+ withdrawRecord.setCreateTime(new Date());
+ withdrawRecord.setAuditStatus(1);
+ withdrawRecordService.save(withdrawRecord);
+
// 未开启全局 提现审核，则用户提现不需要后台审核
if (Constants.ZERO.equals(withdrawalSetting.getEnableProcess())) {
// 已通过
withdraw.setState(Constants.ONE);
// 商家微信打款至微信零钱
boolean update = weChatPay(order.getOrderMoney(), openId,withdraw.getId(),order.getServerName());
-// if (!update) {
-// throw new GlobalException("交易提现失败，请检查是否绑定微信！");
-// }
+ if (!update) {
+ throw new GlobalException("交易提现失败，请检查是否绑定微信！");
+ }
} else {
// 待审核
withdraw.setState(Constants.ZERO);
@@ -394,7 +398,10 @@
JSONObject.toJSONString(postMap),
"7EEA04429B006E12AAA421C002EC48BBEED5BE94",
"1665330417",
- "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
+// "D:\\apiclient_key.pem",
+ "/usr/local/vx/apiclient_key.pem",
+
+ "/v3/fund-app/mch-transfer/transfer-bills");
JSONObject jsonObject = JSONObject.parseObject(result);
// WithdrawDetail withdrawDetail = new WithdrawDetail();
// withdrawDetail.setWithdrawId(withdrawId);
@@ -422,15 +429,12 @@
withdrawDetail.setMoney(transferAmount);
withdrawDetail.setOutBatchNo(postMap.get("out_bill_no")+"");
withdrawDetailService.save(withdrawDetail);
-
-
} else {
- allTransfersSuccessful = false;
- break;
+ throw new GlobalException("提现失败，失败原因:"+jsonObject.getString("message"));
+// allTransfersSuccessful = false;
+// break;
}
-
}
-
return allTransfersSuccessful;
}
--
Gitblit v1.7.1