java/Robotaxi.git

			@@ -596,7 +596,7 @@
			@PostMapping("/inner/order/todayCancellationCount")
			public R<Integer> todayCancellationCount(@RequestParam Long userId){
			long count = xpOrderService.count(new QueryWrapper<XpOrder>().eq("app_user_id", userId).eq("status", 0)
			.eq("is_deleted", 0).last(" and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d"));
			.eq("is_deleted", 0).last(" and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')"));
			return R.ok((int)count);
			}

			@@ -299,13 +299,17 @@
			if (gearLevel == null \|\| gearLevel != 4) {
			throw new ServiceException("车辆非P档，无法操作后备箱", I18nKeyConstant.VEHICLE_NOT_P_GEAR);
			}
			if(xpOrder.getOpenTrunk()==0){
			xpOrder.setOpenTrunk(1);
			vehiclesCommandVo.setCommandCode(VehiclesCommandEnum.DOOR_TRUNK_OPEN.getCommand());
			}
			if(xpOrder.getOpenTrunk()==1) {
			//查询后备箱开关状态
			VehicleTemperatureDto vehicleTemperatureDto = vehicleControlUtil.queryVehicleTemperature(String.valueOf(xpOrder.getAppUserId()), xpVehicle.getVehicleVin());
			VehicleStateVo trunkAjarCloseSt = vehicleTemperatureDto.getStateMap().get("trunkAjarCloseSt");
			//打开状态
			if(null != trunkAjarCloseSt && trunkAjarCloseSt.getValue().equals("1")){
			xpOrder.setOpenTrunk(2);
			vehiclesCommandVo.setCommandCode(VehiclesCommandEnum.DOOR_TRUNK_CLOSE.getCommand());
			}else{
			//关闭状态
			xpOrder.setOpenTrunk(1);
			vehiclesCommandVo.setCommandCode(VehiclesCommandEnum.DOOR_TRUNK_OPEN.getCommand());
			}
			}
			try {
			@@ -319,9 +323,7 @@
			//}
			String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId());
			log.info("车辆控制结果：{}", result);
			JSONObject jsonObject = JSONObject.parseObject(result);
			Integer code = jsonObject.getInteger("code");
			if (code != 0) {
			if (!result.contains("msgId")) {
			return 0;
			}else {
			xpOrderClient.updateOrder(xpOrder);
			@@ -359,16 +361,14 @@
			vehiclesCommandVo.setExtParam(vehiclesCommandParamVo);
			try {
			String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId());
			log.info("车辆控制结果：{}", result);
			JSONObject jsonObject = JSONObject.parseObject(result);
			String msgId = jsonObject.getString("msgId");
			if (StringUtils.isEmpty(msgId)) {
			log.info("车辆温度设置结果：{}", result);
			if (!result.contains("msgId")) {
			return 0;
			}else {
			return 1;
			}
			} catch (Exception e) {
			log.error("车辆控制异常：{}", e.getMessage());
			log.info("车辆温度设置异常：{}", e.getMessage());
			return 0;
			}
			}

	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2649,7 +2649,7 @@
			public void saveVehicleLocation(OrderTrajectory orderTrajectory) {
			// 查询订单信息
			Integer status = redisService.getCacheObject("ORDER_STATUS:" + orderTrajectory.getOrderId());
			if(status < 6){
			if(status < 6 \|\| status > 8){
			return;
			}

			@@ -1437,7 +1437,7 @@
			public void saveVehicleLocation(OrderTrajectory orderTrajectory) {
			// 查询订单信息
			Integer status = redisService.getCacheObject("ORDER_STATUS:" + orderTrajectory.getOrderId());
			if(status < 6){
			if(status < 6 \|\| status > 8){
			return;
			}