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

Pu Zhibing

昨天 bf2acefcf5ba801d3e4a4f507c5f064fc93625cc

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

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -950,7 +950,7 @@
        String lat = orderPosition.getLat();
        OrderCrossCity order = this.selectById(orderId);
        if(null == order){
            System.err.println("订单数据异常：" + orderId);
            System.err.println("跨城订单数据异常：" + orderId);
            return false;
        }


 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverServiceMapper.xml

@@ -78,57 +78,16 @@

    </select>
    <select id="queryOrderMoneyDataFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
        select * from (
        select
        orderNum,
        1 as type,
        orderType as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_private_car
        where driverId = #{uid} and state in (8,9)
        money as orderMoney
        from t_income
        where userType =2  and objectId = #{uid} and type =2
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>

        union all

        select
        orderNum,
        2 as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_taxi
        where driverId = #{uid} and state in (8,9)
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>

        union all

        select
        orderNum,
        3 as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_cross_city
        where driverId = #{uid} and state in (8,9)
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>
        ) t1
        order by t1.orderTime desc
        order by insertTime desc



@@ -138,65 +97,18 @@

    </select>
    <select id="queryOrderMoneyDataFromDriverAll" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
        select * from (
        select
        orderNum,
        1 as type,
        orderType as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_private_car
        where driverId = #{uid} and state in (8,9)
        money as orderMoney
        from t_income
        where userType =2  and objectId = #{uid} and type =2
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>

        union all

        select
        orderNum,
        2 as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_taxi
        where driverId = #{uid} and state in (8,9)
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>

        union all

        select
        orderNum,
        3 as type,
        insertTime as orderTime,
        id as orderId,
        boardingAddress as startAddress,
        getoffAddress as endAddress,
        state,
        orderMoney
        from t_order_cross_city
        where driverId = #{uid} and state in (8,9)
        <if test="sTime !=null">
            and insertTime between #{sTime} and #{eTime}
        </if>
        ) t1
        order by t1.orderTime desc







        order by insertTime desc
    </select>

    <select id="queryOrderPromotionFromDriver" resultType="com.stylefeng.guns.modular.system.model.vo.DriverOrderDataNextVo">
        select * from (
        select
@@ -209,7 +121,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_private_car
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9)  and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>
@@ -226,7 +138,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_taxi
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>
@@ -243,7 +155,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_cross_city
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>
@@ -270,7 +182,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_private_car
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>
@@ -287,7 +199,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_taxi
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>
@@ -304,7 +216,7 @@
        state,
        promotionMoney as orderMoney
        from t_order_cross_city
        where promotionDriverId = #{uid} and state in (8,9)
        where promotionDriverId = #{uid} and state in (8,9) and successTime is not null
        <if test="sTime !=null">
            and successTime between #{sTime} and #{eTime}
        </if>

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

@@ -1696,33 +1696,37 @@
        DriverOrderMoneyDataVo driverOrderDataVo = new DriverOrderMoneyDataVo();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM");
        // 总的订单数
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
        // 跨城订单
        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
        // 出租车订单
        List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
//        // 总的订单数
//        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
//        // 跨城订单
//        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
//        // 出租车订单
//        List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("driverId", uid));


        double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();
        double sum1 = orderCrossCities.stream().mapToDouble(OrderCrossCity::getOrderMoney).sum();
        double sum2 = orderTaxis.stream().mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverOrderDataVo.setAllOrderMoney(new BigDecimal(sum +sum1+sum2));
        List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("objectType", 2).eq("type", 2));


//        double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();
//        double sum1 = orderCrossCities.stream().mapToDouble(OrderCrossCity::getOrderMoney).sum();
//        double sum2 = orderTaxis.stream().mapToDouble(OrderTaxi::getOrderMoney).sum();
        double sum4 = incomes.stream().mapToDouble(Income::getMoney).sum();
        driverOrderDataVo.setAllOrderMoney(new BigDecimal(sum4));



        double count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderPrivateCar::getOrderMoney).sum();
        double count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderCrossCity::getOrderMoney).sum();
        double count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverOrderDataVo.setTodayOrderMoney(new BigDecimal(count+count1+count2));
        double count = incomes.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(Income::getMoney).sum();
//        double count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderCrossCity::getOrderMoney).sum();
//        double count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverOrderDataVo.setTodayOrderMoney(new BigDecimal(count));


        Date date = new Date();
        String month = simpleDateFormat1.format(date);
        double count3 = orderPrivateCars.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(OrderPrivateCar::getOrderMoney).sum();
        double count4 = orderCrossCities.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(OrderCrossCity::getOrderMoney).sum();
        double count5 = orderTaxis.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverOrderDataVo.setMonthOrderMoney(new BigDecimal(count3+count4+count5));
        double count3 = incomes.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(Income::getMoney).sum();
//        double count4 = orderCrossCities.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(OrderCrossCity::getOrderMoney).sum();
//        double count5 = orderTaxis.stream().filter(e -> simpleDateFormat1.format(e.getInsertTime()).equals(month)).mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverOrderDataVo.setMonthOrderMoney(new BigDecimal(count3));

        String sTime=null;
        String eTime=null;
@@ -1744,11 +1748,11 @@
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM");
        // 总的订单数
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid));
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid).isNotNull("successTime"));
        // 跨城订单
        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid));
        List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid).isNotNull("successTime"));
        // 出租车订单
        List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid));
        List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("promotionDriverId", uid).isNotNull("successTime"));


        BigDecimal sum = orderPrivateCars.stream().map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);

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

@@ -87,15 +87,49 @@
    </select>

    <select id="queryMyOrderList" resultType="java.util.Map">
        select
            id as orderId,
            DATE_FORMAT(addTime, '%Y-%m-%d %H:%i') as orderTime,
            DATE_FORMAT(startTime, '%m月%d日 %H:%i') as time,
        startName as startAddress,
        endName as endAddress,
        driverId as driverId,
        (8) as orderType,
        state as state
        from app_order_ride where userId = #{uid} order by addTime desc limit #{pageNum}, #{size}
        SELECT
            *
        FROM
            (
                SELECT
                    id AS orderId,
                    DATE_FORMAT( addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
                    DATE_FORMAT( startTime, '%m月%d日 %H:%i' ) AS TIME,
        startName AS startAddress,
        endName AS endAddress,
        driverId AS driverId,
        ( 8 ) AS orderType,
        1 AS rideUserType,
        startLon as startLon,
        startLat as startLat,
        state AS state
                FROM
                    app_order_ride
                WHERE
                    userId = #{uid}

                UNION all

                SELECT
                    t1.id AS orderId,
                    DATE_FORMAT( t1.addTime, '%Y-%m-%d %H:%i' ) AS orderTime,
                    DATE_FORMAT( t1.startTime, '%m月%d日 %H:%i' ) AS TIME,
                    t1.startName AS startAddress,
                    t1.endName AS endAddress,
                    t1.driverId AS driverId,
                    ( 8 ) AS orderType,
                    2 AS rideUserType,
                    startLon as startLon,
                    startLat as startLat,
                    t1.state AS state
                FROM
                    app_order_travel t1
                    LEFT JOIN t_user t2 ON t1.driverId = t2.driverId
                WHERE
                    t2.id = #{uid}
            ) as t
        ORDER BY
            t.orderTime DESC
            LIMIT #{pageNum}, #{size}
    </select>
</mapper>

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

@@ -64,8 +64,39 @@
    @ApiModelProperty("服务结束事件")
    private String endServiceTime;

    private String startLon;

    private String startLat;

    @ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
    private Integer rideType;

    @ApiModelProperty("乘车用户类型(1=个人，2=司机)")
    private Integer rideUserType;

    public Integer getRideUserType() {
        return rideUserType;
    }

    public void setRideUserType(Integer rideUserType) {
        this.rideUserType = rideUserType;
    }

    public String getStartLon() {
        return startLon;
    }

    public void setStartLon(String startLon) {
        this.startLon = startLon;
    }

    public String getStartLat() {
        return startLat;
    }

    public void setStartLat(String startLat) {
        this.startLat = startLat;
    }

    public Integer getRideType() {
        return rideType;
@@ -319,6 +350,10 @@
                orderWarpper.setArriveTimeExpect(null != map.get("arriveTimeExpect") ? String.valueOf(String.valueOf(map.get("arriveTimeExpect"))) : "");
                orderWarpper.setPickUpCode(null != map.get("pickUpCode") ? String.valueOf(map.get("pickUpCode")) : "");
                orderWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
                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);
                list.add(orderWarpper);
            }
        }