java/Robotaxi.git

			@@ -335,7 +335,7 @@
			* 手动结束订单
			*/

			@PutMapping("/api/v1/order/endTrip/{order_id}")
			@PutMapping("/api/v1/mini-program/order/endTrip/{order_id}")
			@ApiOperation(value = "结束行程", tags = {"小程序-结束行程"})
			@XpClientCheck(checkToken = false, checkOtpToken = true)
			public R endTrip(@PathVariable("orderId") Long orderId,HttpServletRequest request) {
			@@ -348,7 +348,7 @@
			* 获取行程费用明细
			*/

			@PutMapping("/api/v1/order/fare-breakdown/{order_id}")
			@PutMapping("/api/v1/mini-program/order/fare-breakdown/{order_id}")
			@ApiOperation(value = "获取行程费用明细", tags = {"小程序-获取行程费用明细"})
			@XpClientCheck(checkToken = false, checkOtpToken = true)
			public R<FareBreakdownVo> fareBreakdown(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
			@@ -359,7 +359,7 @@
			/**
			* 订单评价
			*/
			@PostMapping("/api/v1/order/payment")
			@PostMapping("/api/v1/mini-program/order/payment")
			@ApiOperation(value = "发起支付", tags = {"小程序-发起支付"})
			@XpClientCheck(checkToken = false, checkOtpToken = true)
			public R payment(@Validated @RequestBody XpOrderPayDto dto, HttpServletRequest request) {

			@@ -7,6 +7,8 @@
			import cn.hutool.core.bean.BeanUtil;
			import com.alibaba.fastjson2.JSON;
			import com.alibaba.fastjson2.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.xiaopeng.api.dto.operation.VehiclePositionByVinDto;
			import com.xiaopeng.api.dto.vehicleConvoy.VehicleTemperatureDto;
			import com.xiaopeng.api.feignClient.maintenance.XpChargingRecordClient;
			import com.xiaopeng.api.feignClient.maintenance.XpVehiclePreparationClient;
			@@ -23,12 +25,10 @@
			import com.xiaopeng.vehicleConvoy.model.exportExcel.XpVehicleExportExcel;
			import com.xiaopeng.vehicleConvoy.model.importExcel.XpVehicleImportExcel;
			import com.xiaopeng.vehicleConvoy.model.query.*;
			import com.xiaopeng.vehicleConvoy.model.vo.XpVehicleVO;
			import com.xiaopeng.vehicleConvoy.service.IXpVehicleAnnualRecordService;
			import com.xiaopeng.vehicleConvoy.service.IXpVehicleService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiOperation;
			import io.swagger.annotations.ApiParam;
			import io.swagger.annotations.*;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.StringUtils;

	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史