修改

puzhibing

2024-02-23 6c710eb8ac8ad3c5706eb0a805b4ccdc447bcdec

修改

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -1192,6 +1192,9 @@
                    switch (Integer.valueOf(map.get("orderType").toString())){
                        case 1:
                            OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(map.get("incomeId").toString());
                            if(null == orderPrivateCar){
                                continue;
                            }
                            List<Income> incomes = incomeService.queryData(1, null, 2, orderPrivateCar.getId(), 1);
                            map1.put("travelMoney", orderPrivateCar != null ? orderPrivateCar.getOrderMoney() : 0);//行程费
                            map1.put("parkMoney", orderPrivateCar != null ? orderPrivateCar.getParkMoney() : 0);//停车费

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -780,11 +780,10 @@
            if (1 == optType){  //解冻
                tDriver.setAuthState(2);
            }else if (2 == optType){  //冻结
                String key = redisUtil.getValue(tDriver.getPhone());
                redisUtil.remove(key);//删除个人信息数据
                String token = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
                redisUtil.remove(token);//删除个人信息数据
                redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
                redisUtil.remove("DRIVER_" + driverId);//清除存储的token
                redisUtil.remove("DEVICE_" + driverId);//清除车载端登录的标识
                tDriver.setAuthState(3);
            }
            tDriver.setRemark(remark);

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java

@@ -117,7 +117,7 @@
        if(ToolUtil.isNotEmpty(key)){
            Map<String,String> map = new HashMap<>();
            map.put("key", key);
            String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/getValue", map);
            String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/remove", map);
            JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
            if(jsonObject.getIntValue("code") != 200){
                System.err.println("调用redis出错了");