Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaYiXin...

liujie

2025-11-25 b502ac4e96aca2ab29caa77187ab7673a853a797

 ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java

@@ -183,8 +183,8 @@
                        try {
                            log.info("用户提现创建=========");
                            String reqSeqId = RequestSeqUtil.generate("TX");
                            JSONObject result = douGongWithdrawBiz.encashment(reqSeqId, tPubWithdrawal.getMoney(), userWithdrawals.get(0).getHuiFuId(), userWithdrawals.get(0).getTokenNo(), 2);
                            if (!result.get("resp_code").equals("00000000") || !result.getBoolean("success")) {
                            Map<String,Object> result = douGongWithdrawBiz.encashment(reqSeqId, tPubWithdrawal.getMoney(), userWithdrawals.get(0).getHuiFuId(), userWithdrawals.get(0).getTokenNo(), 2);
                            if (!result.get("resp_code").equals("00000000")) {
                                return new ErrorTip(500, "操作失败，异常原因："+result.get("resp_desc"));
                            }

@@ -195,7 +195,7 @@
                            //tPubWithdrawal.setWithdrawId(withdrawalResp.getWithdrawalId());
                            tPubWithdrawalService.updateById(tPubWithdrawal);
                            //log.info("用户提现创建信息========="+withdrawalResp.toString());
                            log.info("用户提现创建信息：{}", result.toJSONString());
                            log.info("用户提现创建信息：{}", JSONObject.toJSONString(result));
                            log.info("用户提现创建成功=========");
                        } catch (Exception e) {
                            log.info("用户提现创建失败=========");
@@ -236,8 +236,8 @@
                    try {
                        log.info("司机提现创建=========");
                        String reqSeqId = RequestSeqUtil.generate("TX");
                        JSONObject result = douGongWithdrawBiz.encashment(reqSeqId, tPubWithdrawal.getMoney(), userWithdrawal.getHuiFuId(), userWithdrawal.getTokenNo(), 2);
                        if (!result.get("resp_code").equals("00000000") || !result.getBoolean("success")) {
                        Map<String,Object> result = douGongWithdrawBiz.encashment(reqSeqId, tPubWithdrawal.getMoney(), userWithdrawal.getHuiFuId(), userWithdrawal.getTokenNo(), 2);
                        if (!result.get("resp_code").equals("00000000")) {
                            return new ErrorTip(500, "操作失败，异常原因："+result.get("resp_desc"));
                        }

@@ -248,7 +248,7 @@
                        //tPubWithdrawal.setWithdrawId(withdrawalResp.getWithdrawalId());
                        tPubWithdrawalService.updateById(tPubWithdrawal);
                        //log.info("司机提现创建信息========="+withdrawalResp.toString());
                        log.info("司机提现创建信息：{}", result.toJSONString());
                        log.info("司机提现创建信息：{}", JSONObject.toJSONString(result));
                        log.info("司机提现创建成功=========");
                    } catch (Exception e) {
                        log.info("司机提现创建失败=========");