线下支付

xuhy

2025-01-20 48ddf0dd3dabb18308cdcdf2da21bca8262c88f5

线下支付

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

@@ -426,15 +426,16 @@
            @ApiImplicitParam(value = "流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）", name = "state", required = true, dataType = "int"),
            @ApiImplicitParam(value = "当前经度", name = "lon", required = true, dataType = "double"),
            @ApiImplicitParam(value = "当前纬度", name = "lat", required = true, dataType = "double"),
            @ApiImplicitParam(value = "支付方式 1=线上 2=线下支付", name = "payManner", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil process(Integer orderId, Integer orderType, Integer state, Double lon, Double lat, HttpServletRequest request){
    public ResultUtil process(Integer orderId, Integer orderType, Integer state, Double lon, Double lat,Integer payManner, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return orderService.process(orderId, orderType, state, uid, lon, lat);
            return orderService.process(orderId, orderType, state, uid, lon, lat,payManner);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java

@@ -61,7 +61,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception;


    /**

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

@@ -224,7 +224,7 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
        OrderCrossCity orderCrossCity = this.selectById(orderId);
        switch (state){
            case 3://出发前往预约点

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java

@@ -49,7 +49,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception;


    /**

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -194,7 +194,7 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
        OrderLogistics orderLogistics = this.selectById(orderId);
        switch (state){
            case 3://出发前往预约点

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java

@@ -74,7 +74,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payType) throws Exception;
    ResultUtil specail(Integer orderId, Double lon, Double lat, String endAddress) throws Exception;



 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -277,7 +277,7 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        System.err.println("==========="+orderId);
        switch (state){
@@ -307,6 +307,10 @@
                orderPrivateCar.setGetoffAddress(address);
                orderPrivateCar.setGetoffTime(new Date());
                orderPrivateCar.setEndServiceTime(new Date());
                orderPrivateCar.setPayManner(payManner);
                if(payManner==2){
                    orderPrivateCar.setState(8);
                }

//                //设置结束的时候的经纬度
//                if (orderPrivateCar.getEndLat()!=null){

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java

@@ -113,7 +113,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat) throws Exception;
    ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,Integer payManner) throws Exception;
    ResultUtil specail(Integer orderId, Integer uid, Double lon, Double lat,String endAddress) throws Exception;



 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTransferService.java

@@ -53,7 +53,7 @@

    Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;

    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception;

    Map<String, Object> queryMoneyInfo(Integer orderId) throws Exception;


 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -663,24 +663,24 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat) throws Exception {
    public ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,Integer payManner) throws Exception {
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(String.valueOf(lon), String.valueOf(lat));
        String address = geocode.get("address");
        switch (orderType){
            case 1://专车
                return orderPrivateCarService.process(orderId, state, lon, lat, address);
                return orderPrivateCarService.process(orderId, state, lon, lat, address,payManner);
            case 2://出租
                return orderTaxiService.process(orderId, state, lon, lat, address);
                return orderTaxiService.process(orderId, state, lon, lat, address,payManner);
            case 3://城际
                return orderCrossCityService.process(orderId, state, lon, lat, address);
                return orderCrossCityService.process(orderId, state, lon, lat, address,payManner);
            case 4://同城小件
                return orderLogisticsService.process(orderId, state, lon, lat, address);
                return orderLogisticsService.process(orderId, state, lon, lat, address,payManner);
            case 5://跨城小件
                return orderLogisticsService.process(orderId, state, lon, lat, address);
                return orderLogisticsService.process(orderId, state, lon, lat, address,payManner);
            case 6:
                break;
            case 7://专车
                return orderTransferService.process(orderId, state, lon, lat, address);
                return orderTransferService.process(orderId, state, lon, lat, address,payManner);
        }
        return null;
    }

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java

@@ -282,7 +282,7 @@
        return map;
    }
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
        TOrderTransfer orderPrivateCar = this.selectById(orderId);
        switch (state){
            case 3://出发前往预约点
@@ -312,6 +312,11 @@
                orderPrivateCar.setGetoffTime(new Date());
                orderPrivateCar.setEndServiceTime(new Date());

                orderPrivateCar.setPayManner(payManner);
                if(payManner == 2){
                    orderPrivateCar.setState(8);
                }

//                //设置结束的时候的经纬度
//                if (orderPrivateCar.getEndLat()!=null){
//                        orderPrivateCar.setEndLon(lon);

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java

@@ -87,7 +87,7 @@
     * @return
     * @throws Exception
     */
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception;
    ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception;


    /**

 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -363,7 +363,7 @@
     * @throws Exception
     */
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
        OrderTaxi orderTaxi = this.selectById(orderId);
        switch (state){
            case 3://出发前往预约点
@@ -394,6 +394,11 @@
                orderTaxi.setState(6);
                orderTaxi.setEndServiceTime(new Date());

                orderTaxi.setPayManner(payManner);
                if(payManner==2){
                    orderTaxi.setState(8);
                }

                pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
                systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
                break;