无关风月
2025-09-04 e0f4ae4b29578beadb3bde5dc71b557f9f3b20ea
bug修改
2个文件已修改
19 ■■■■ 已修改文件
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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){
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;