liujie
2025-11-26 b19a35bc03e2cdd6c928558977edc506c612905f
update
4个文件已修改
15 ■■■■■ 已修改文件
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java
@@ -224,7 +224,7 @@
        // 结算卡信息
        JSONObject cardInfo = new JSONObject();
        cardInfo.put("card_type", "1");
        cardInfo.put("card_name", userWithdrawal.getBindAcctName());
        cardInfo.put("card_name", userWithdrawal.getOpenAccountName());
        cardInfo.put("card_no", userWithdrawal.getBankCardCode());
        cardInfo.put("prov_id", userWithdrawal.getBankCardProvinceCode());
        cardInfo.put("area_id", userWithdrawal.getBankCardCityCode());
@@ -256,6 +256,7 @@
         * DM:当日到账;到账资金不包括当天的交易资金;
         * 示例值:T1
         */
        cashConfig.put("switch_state", "1");
        cashConfig.put("cash_type", "D1");
        cashConfig.put("fix_amt", "0.00");
        cashConfig.put("weekday_fix_amt", "0.00");
@@ -295,7 +296,7 @@
        // 3. 发起API调用
        Map<String, Object> response = BasePayRequest.requestBasePay("v2/trade/acctpayment/balance/query", paramsInfo, null, false);
        log.info("账户余额信息查询返回参数:{}", response);
        JSONArray accountList = JSONArray.parseArray(JSONObject.toJSONString(response.get("acctInfo_list")));
        JSONArray accountList = JSONArray.parseArray(response.get("acctInfo_list").toString());
        if (accountList != null && !accountList.isEmpty()) {
            JSONObject acctInfo = accountList.getJSONObject(0);
            log.info("账户余额信息查询返回余额:{}", acctInfo.getString("avail_bal"));
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -88,9 +88,9 @@
            if(null == driver.getLaveActivityMoney()){
                return ResultUtil.error("账户没有余额,不能提现");
            }
            if(driver.getLaveActivityMoney().compareTo(money) < 0){
                return ResultUtil.error("提现金额必须小于账户余额");
            }
//            if(driver.getLaveActivityMoney().compareTo(money) < 0){
//                return ResultUtil.error("提现金额必须小于账户余额");
//            }
            withdrawal.setBalance(driver.getLaveActivityMoney());
        }
        if(type == 2){
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
@@ -298,6 +298,8 @@
                userBankAccount.setUserId(driverId);
                userBankAccount.setBankName(userWithdrawal.getBankName());
                userBankAccount.setBankCardProvinceCode(userWithdrawal.getBankCardProvinceCode());
                userBankAccount.setBankCardCityCode(userWithdrawal.getBankCardCityCode());
                userBankAccountService.insert(userBankAccount);
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
@@ -89,7 +89,7 @@
            UserInfo userInfo1 = userInfoService.selectById(uid);
            // 查询银行卡的银行连号和编号
            UserBankAccount bankCard = bankAccountService.selectOne(new EntityWrapper<UserBankAccount>()
                    .eq("bankCardCode", code).eq("phone",userInfo1.getPhone())
                    .eq("bankCardCode", code).eq("phone",userInfo1.getPhone()).eq("status",1)
                    .last("LIMIT 1"));
            if(Objects.isNull(bankCard)){
                return ResultUtil.runErr("该银行卡不存在!");