liujie
2025-11-26 c14feb8ac4d5cbca9948572f4c177c5b957aa8d0
update
4个文件已修改
21 ■■■■■ 已修改文件
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WinxinController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongPayUtil.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
@@ -96,7 +96,7 @@
                    out.flush();
                    out.close();
                    String[] split = out_trade_no.split("_");
                    reassignService.payReassign(split[0], order_id, 1);
                    reassignService.payReassign(out_trade_no, order_id, 1);
                }
            }
        }catch (Exception e){
@@ -139,7 +139,7 @@
                    out.flush();
                    out.close();
                    String[] split = out_trade_no.split("_");
                    reassignService.payReassign(split[0], order_id, 2);
                    reassignService.payReassign(out_trade_no, order_id, 2);
                }
            }
        }catch (Exception e){
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WinxinController.java
@@ -46,16 +46,16 @@
            if (ToolUtil.isEmpty(code)) {
                return ResultUtil.error("参数为空");
            }
            //未登录过获取openId进行授权
            String openID = null;
            WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
            openID = accessToken.getOpenId();
//            //未登录过获取openId进行授权
//            String openID = null;
//            WxMpOAuth2AccessToken accessToken = wxMpService.oauth2getAccessToken(code);
//            openID = accessToken.getOpenId();
            Driver driver = driverService.selectById(uid);
            driver.setAppletsOpenId(openID);
            driver.setAppletsOpenId(code);
            driverService.updateById(driver);
            return ResultUtil.success();
        } catch (Exception e) {
            // e.printStackTrace();    //尽量不要使用这个打印异常,会造成内存锁,使用log日志就好
             e.printStackTrace();    //尽量不要使用这个打印异常,会造成内存锁,使用log日志就
            return ResultUtil.error("获取openID异常");
        }
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongPayUtil.java
@@ -34,8 +34,8 @@
    private HuiFuProperties huiFuProperties;
    @Value("${callbackPath}")
    private static String callbackPath;//支付回调网关地址
    private static String callbackPath = "http://221.182.45.100:8007";//支付回调网关地址
//    private static String callbackPath = "https://zhentonggongsi.com:443/driver";//支付回调网关地址
    @Autowired
    private RedisUtil redisUtil;
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -345,6 +345,7 @@
        DATE_FORMAT(a.networkCarlssueDate, '%Y-%m-%d') as networkCarlssueDate,
        a.driverContactAddress_ as driverContactAddress_,
        a.idCard as idCard,
        a.appletsOpenId openid,
        a.idCardImgUrl1 as idCardImgUrl1,
        a.idCardImgUrl2 as idCardImgUrl2,
        DATE_FORMAT(a.getDriverLicenseDate, '%Y-%m-%d') as getDriverLicenseDate,