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

Pu Zhibing

23 小时以前 f5781289aaedc8460437154e179d85652995e7b8

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

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -1704,7 +1704,7 @@
//        List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("driverId", uid));


        List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("objectType", 2).eq("type", 2));
        List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("userType", 2).eq("type", 2));


//        double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml

@@ -119,8 +119,8 @@
                    t1.driverId AS driverId,
                    ( 8 ) AS orderType,
                    2 AS rideUserType,
                    startLon as startLon,
                    startLat as startLat,
                    t1.startLon as startLon,
                    t1.startLat as startLat,
                    t1.state AS state
                FROM
                    app_order_travel t1

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java

@@ -353,7 +353,7 @@
                orderWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
                orderWarpper.setStartLat(null != map.get("startLat") ? String.valueOf(map.get("startLat")) : "");
                orderWarpper.setStartLon(null != map.get("startLon") ? String.valueOf(map.get("startLon")) : "");
                orderWarpper.setRideUserType(null != map.get("rideUserType") ? Integer.valueOf(String.valueOf(map.get("companyId"))) : 0);
                orderWarpper.setRideUserType(null != map.get("rideUserType") ? Integer.valueOf(String.valueOf(map.get("rideUserType"))) : 0);
                list.add(orderWarpper);
            }
        }