跨城修改

xuhy

3 天以前 eb2df7a2d179ba17c591941c8272624844ff9f1f

跨城修改

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java

@@ -44,7 +44,7 @@
            @ApiImplicitParam(value = "线路id", name = "lineId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "服务车型id", name = "serverCarModelId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "车辆总座位数", name = "totalSeat", required = true, dataType = "int"),
            @ApiImplicitParam(value = "座位编号（1,3,4）", name = "seatNumber", required = true, dataType = "int")
            @ApiImplicitParam(value = "座位编号（1,3,4）", name = "seatNumber", required = false, dataType = "int")
    })
    public ResultUtil queryOrderMoney(String startLonLat, String endLonLat, Integer peopleNumber, Integer travelMode,
                                      Integer lineId, Integer serverCarModelId, Integer totalSeat, String seatNumber){

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

@@ -575,7 +575,7 @@
        orderCrossCity.setEndAddress(endAddress);
        orderCrossCity.setMileage(0D);
        ResultUtil<Map<String, Object>> price = this.getPrice(orderCrossCityWarpper.getDistance(), orderCrossCityWarpper.getPeopleNumber(), orderCrossCityWarpper.getTravelMode(), orderCrossCityWarpper.getLineId(),
                orderCrossCityWarpper.getServerCarModelId(), orderCrossCityWarpper.getTotalSeat(), orderCrossCityWarpper.getSeatNumber());
                orderCrossCityWarpper.getServerCarModelId(), orderCrossCityWarpper.getTotalSeat(), null);
        Double money = Double.valueOf(price.getData().get("price").toString());
        orderCrossCity.setOrderMoney(money);
        Integer companyId = driver.getCompanyId();
@@ -584,7 +584,7 @@
        orderCrossCity.setPassengers(userInfo.getNickName());
        orderCrossCity.setPassengersPhone(userInfo.getPhone());
        orderCrossCity.setPeopleNumber(orderCrossCityWarpper.getPeopleNumber());
        orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
//        orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
        List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("orderNum", orderCrossCity.getOrderNum()).eq("isDelete", 1));
        orderCrossCity.setSort(orderCrossCities.size() + 1);
        orderCrossCity.setState(7);//待支付
@@ -637,34 +637,34 @@
            lineShiftDriver.setLaveSeatNumber("");
        }else{//拼车
            lineShiftDriver.setLaveSeat((lineShiftDriver.getLaveSeat() - orderCrossCity.getPeopleNumber()) < 0 ? 0 : lineShiftDriver.getLaveSeat() - orderCrossCity.getPeopleNumber());
            String[] split = orderCrossCity.getSeatNumber().split(",");
            String[] split1 = lineShiftDriver.getLaveSeatNumber().split(",");
//            String[] split = orderCrossCity.getSeatNumber().split(",");
//            String[] split1 = lineShiftDriver.getLaveSeatNumber().split(",");
            String seatNumber = "";
            //先判断选中座位号和剩余座位号是否匹配
            for(String spl : split){
                boolean b = true;
                for(String sp : split1){
                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
                        b = false;
                        break;
                    }
                }
                if(b){
                    throw new SystemException("您选中的" + spl + "号座位已被占用，请选择其他座位!");
                }
            }
            for(String sp : split1){
                boolean b = true;
                for(String spl : split){
                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
                        b = false;
                        break;
                    }
                }
                if(b && ToolUtil.isNotEmpty(sp)){
                    seatNumber += (sp + ",");
                }
            }
//            for(String spl : split){
//                boolean b = true;
//                for(String sp : split1){
//                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
//                        b = false;
//                        break;
//                    }
//                }
//                if(b){
//                    throw new SystemException("您选中的" + spl + "号座位已被占用，请选择其他座位!");
//                }
//            }
//            for(String sp : split1){
//                boolean b = true;
//                for(String spl : split){
//                    if(ToolUtil.isNotEmpty(spl) && ToolUtil.isNotEmpty(sp) && sp.equals(spl)){
//                        b = false;
//                        break;
//                    }
//                }
//                if(b && ToolUtil.isNotEmpty(sp)){
//                    seatNumber += (sp + ",");
//                }
//            }
            lineShiftDriver.setLaveSeatNumber((ToolUtil.isNotEmpty(seatNumber) && seatNumber.length() > 0) ?
                    seatNumber.substring(0, seatNumber.length() - 1) : "");
        }
@@ -943,7 +943,7 @@
//            double num8 = Double.valueOf(jsonObject.getString("num8")).doubleValue();
//            double num9 = Double.valueOf(jsonObject.getString("num9")).doubleValue();
            if(travelMode == 1){//拼车
                String[] split = seatNumber.split(",");
//                String[] split = seatNumber.split(",");
//                boolean b = false;
//                for(String s : split){
//                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))
@@ -981,7 +981,7 @@
//            double num12 = Double.valueOf(jsonObject.getString("num12")).doubleValue();//五十四座系数
            if(travelMode == 1){//拼车
                double unitPrice = (distance1 * num3 * (num1 / (num2 * num3))) + ((distance1 - num2) * num3 * num4);
                String[] split = seatNumber.split(",");
//                String[] split = seatNumber.split(",");
//                boolean b = false;
//                for(String s : split){
//                    if((totalSeat == 4 && s.equals("3")) || (totalSeat == 6 && s.equals("5"))

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/OrderCrossCityWarpper.java

@@ -48,7 +48,7 @@
    private String frequentPassengersId;
    @ApiModelProperty(value = "车辆总座位数", required = true, dataType = "int")
    private Integer totalSeat;
    @ApiModelProperty(value = "座位编号（1,3,4）", required = true, dataType = "string")
    @ApiModelProperty(value = "座位编号（1,3,4）", required = false, dataType = "string")
    private String seatNumber;
    @ApiModelProperty(value = "备注", required = false, dataType = "string")
    private String remark;