修改bug

Pu Zhibing

2025-11-04 69a5f92870d409be754fa4988c9be7d4b72ec521

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

@@ -694,6 +694,63 @@
    }



    @ResponseBody
    @PostMapping("/base/order/queryOrderInfoNoAuth")
    @ApiOperation(value = "获取服务中的详情数据", tags = {"用户端-服务中"}, notes = "", response = OrderInfoWarpper.class)
    @ApiImplicitParams({
            @ApiImplicitParam(value = "司机id", name = "driverId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
    })
    public ResultUtil<OrderInfoWarpper> queryOrderInfoNoAuth(Integer driverId, Integer orderId) {
        try {
            OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
            if(!orderCrossCity.getDriverId().equals(driverId)){
                return ResultUtil.error("权限不足");
            }
            Map<String, Object> map = orderCrossCityService.queryOrderInfo(orderId);
            List<OrderAdditionalFeeWarpper> list = new ArrayList<>();
            if (map.get("companyId") != null) {
                Company companyId = companyService.selectById(map.get("companyId").toString());
                map.put("companyName", companyId.getName());
            } else {
                map.put("companyName", "");
            }
            if (map.get("telX") != null) {
                map.put("driverPhone", map.get("telX"));
            }
            List<OrderAdditionalFee> orderAdditionalFees = orderAdditionalFeeService.selectList(new EntityWrapper<OrderAdditionalFee>().eq("orderType", 3).eq("orderId", orderId));
            orderAdditionalFees.forEach(orderAdditionalFee -> {
                AdditionalFee additionalFee = additionalFeeService.selectById(orderAdditionalFee.getAdditionalFeeId());
                OrderAdditionalFeeWarpper orderAdditionalFeeWarpper = new OrderAdditionalFeeWarpper();
                orderAdditionalFeeWarpper.setName(additionalFee.getName());
                orderAdditionalFeeWarpper.setAdditionalFee(orderAdditionalFee.getAmount());
                list.add(orderAdditionalFeeWarpper);
            });
            OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map, list);
            orderInfoWarpper.setContentPutOne(new JSONObject());
            orderInfoWarpper.setContentNotOne(new JSONObject());

            orderInfoWarpper.setContentPutTwo(new JSONObject());
            orderInfoWarpper.setContentNotTwo(new JSONObject());

            orderInfoWarpper.setContentPutThree(new JSONObject());
            orderInfoWarpper.setContentNotThree(new JSONObject());

            orderInfoWarpper.setContentExclusive(new JSONObject());
            orderInfoWarpper.setContentPrice(new JSONObject());
            String arriveTime = orderInfoWarpper.getArriveTime();
            if (ToolUtil.isNotEmpty(arriveTime)) {
                orderInfoWarpper.setTime(arriveTime.substring(11, arriveTime.length() - 3));
            }
            return ResultUtil.success(orderInfoWarpper);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    @ResponseBody
    @PostMapping("/api/order/addAppeal")
    @ApiOperation(value = "发起申诉", tags = {"用户端-服务中"}, notes = "", response = OrderInfoWarpper.class)
@@ -1501,6 +1558,35 @@
    }



    @ResponseBody
    @PostMapping("/base/taxi/payTaxiOrder1NoAuth")
    @ApiOperation(value = "1.0-订单完成支付订单操作", tags = {"用户端-出租车", "用户端-专车", "用户端-跨城", "用户端-小件物流"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "支付方式(1=微信，2=支付宝，3=余额)", name = "payType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型（3=跨城）", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "优惠数据id", name = "objectId", required = false, dataType = "int"),
            @ApiImplicitParam(value = "数据类型（1=优惠券，2=打车卡）", name = "objectType", required = false, dataType = "int"),
            @ApiImplicitParam(value = "支付端（1=用户APP端，2=司机APP端，3=用户小程序端）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "小程序支付成功跳转路径", name = "path", required = true, dataType = "String"),
            @ApiImplicitParam(value = "设备当前IP地址", name = "ip", required = true, dataType = "String"),
            @ApiImplicitParam(value = "支付角色（1=乘客，2=司机）", name = "role", required = true, dataType = "int"),
            @ApiImplicitParam(value = "jscode", name = "jscode", required = true, dataType = "String"),
    })
    public ResultUtil payTaxiOrder1NoAuth(Integer payType, Integer orderId, Integer orderType, Integer objectId, Integer objectType, Integer type,
                                    String path, String ip, Integer role, String jscode, HttpServletRequest request) {
        try {
            ResultUtil resultUtil = orderCrossCityService.payCrossCityOrder1(payType, orderId, objectId, objectType, type, path, ip, role, jscode);
            orderCrossCityService.promotion(orderId);
            return resultUtil;
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    /**
     * 订单完成后添加评价操作
     *