From e0f4ae4b29578beadb3bde5dc71b557f9f3b20ea Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:02:37 +0800
Subject: [PATCH] bug修改
---
ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 3 ++-
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
index 683b32e..04e1e60 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
@@ -13,9 +13,11 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;
import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -45,6 +47,8 @@
@Autowired
private ITPubWithdrawalService tPubWithdrawalService;
+ @Autowired
+ private ITUserService userService;
@Autowired
private ITSystemNoticeService tSystemNoticeService;
@@ -136,10 +140,18 @@
if (2 == state){ //同意提现
stateObj = 1;
// 支付宝提现
+ String certNo = "";
+ if (tPubWithdrawal.getUserType()==1){
+ TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
+ certNo = tUser.getIdCard();
+
+ }else{
+ TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ certNo = tDriver.getIdCard();
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
- String s = AlipayUtils.aliWithdrawal(code, tPubWithdrawal.getMoney() + "", tPubWithdrawal.getCode(), tDriver.getIdCard());
+ String s = AlipayUtils.aliWithdrawal(code, tPubWithdrawal.getMoney() + "", tPubWithdrawal.getCode(), certNo);
JSONObject res = JSONObject.parseObject(s);
JSONObject alipayFundTransUniTransferResponse = res.getJSONObject("alipay_fund_trans_uni_transfer_response");
if (alipayFundTransUniTransferResponse!=null){
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
index 6200adb..42b863e 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
@@ -690,7 +690,8 @@
var id = YesDriver.seItem.id;
var mount = $("#mount").val();
var type = $("#type").val();
- var ajax = new $ax(Feng.ctxPath + "/tDriver/changeMoney", function (data) {
+ var remark = $("#remark").val();
+ var ajax = new $ax(Feng.ctxPath + "/tIncome/changeMoney", function (data) {
if (data == 502){
Feng.error("司机余额小于扣除的金额!");
return;
--
Gitblit v1.7.1