12.10

luodangjia

2024-12-10 31ce6be2d56798d9509e6d90335999064351f7f3

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

@@ -574,7 +574,8 @@
    }



    @Autowired
    private WeChatUtil weChatUtil;

    /**
     * 获取个人中心详情
@@ -589,12 +590,21 @@
    })
    public ResultUtil<DriverInfoWarpper> queryInfo(HttpServletRequest request){
        try {
            System.err.println("=====");
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            Map<String, Object> map = driverService.queryInfo(uid);
            return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));
            DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(map);
            if (driverInfoWarpper.getWechatPic()==null){
                Driver driver = driverService.selectById(uid);
                String rid = weChatUtil.rid("/pages/home/scanPage/scanPage", uid);
                driver.setWechatPic(rid);
                driverService.updateById(driver);
                driverInfoWarpper.setWechatPic(rid);
            }
            return ResultUtil.success(driverInfoWarpper);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -883,6 +893,8 @@
        }
    }

    @Autowired
    private ITOrderTransferService orderTransferService;

    /**
     * 获取收入明细
@@ -913,19 +925,22 @@
                baseWarpper.setAmount(Double.valueOf(String.valueOf(null != map.get("money") ? map.get("money") : 0)));
                switch (Integer.valueOf(String.valueOf(null != map.get("orderType") ? map.get("orderType") : 0))){
                    case 1:
                        baseWarpper.setName("快车");
                        baseWarpper.setName("专车");
                        break;
                    case 2:
                        baseWarpper.setName("出租车");
                        break;
                    case 3:
                        baseWarpper.setName("直通车");
                        baseWarpper.setName("跨城");
                        break;
                    case 4:
                        baseWarpper.setName("同城小件物流");
                        break;
                    case 5:
                        baseWarpper.setName("跨城小件物流");
                        break;
                    case 7:
                        baseWarpper.setName("接送机/站");
                        break;
                }
                Map<String, Object> map1 = new HashMap<>();
@@ -987,6 +1002,17 @@
                            map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
                        }
                        break;
                    case 7:
                        TOrderTransfer orderTransfer = orderTransferService.selectById(map.get("incomeId").toString());
                        if(null != orderTransfer){
                            List<Income> incomes = incomeService.queryData(1, null, 2, orderTransfer.getId(), 1);
                            map1.put("travelMoney", null != orderTransfer.getOrderMoney() ? orderTransfer.getOrderMoney() : 0);//行程费
                            map1.put("parkMoney", null != orderTransfer.getParkMoney() ? orderTransfer.getParkMoney() : 0);//停车费
                            map1.put("tipMoney", 0);//小费
                            map1.put("roadTollMoney", null != orderTransfer.getRoadTollMoney() ? orderTransfer.getRoadTollMoney() : 0);//过路费
                            map1.put("rakeMoney", incomes.size() > 0 ? incomes.get(0).getMoney() : 0);//抽成
                        }
                        break;
                }

                baseWarpper.setData(map1);