java/Robotaxi.git

			@@ -32,7 +32,7 @@
			xou.id_card_front, xou.id_card_back, xou.driver_license, xou.certificate_of_no_criminal_record,
			xou.training_graduation_certificate, xou.is_deleted, xou.create_time, xou.update_time, xou.create_by
			from xp_operations_user xou
			left join xp_operations_role xor on xou.id = xor.operations_user_id
			left join xp_operations_role xore on xou.id = xore.operations_user_id
			where xou.is_deleted = 0
			<if test="query.nickName != null and query.nickName != ''">
			and xou.nick_name like concat('%',#{query.nickName},'%')
			@@ -41,7 +41,7 @@
			and xou.phone_number like concat('%',#{query.phoneNumber},'%')
			</if>
			<if test="query.roleId != null">
			and xor.role_id = #{query.roleId}
			and xore.role_id = #{query.roleId}
			</if>
			<if test="query.status != null">
			and xou.status = #{query.status}

			@@ -51,8 +51,7 @@

			@ApiModelProperty(value = "任务描述图片")
			private String taskImage;
			@ApiModelProperty(value = "任务描述图片")
			private String belongUserIds;



			@ApiModelProperty(value = "车辆id")

			@@ -851,6 +851,7 @@
			XpTask task = this.getById(id);
			task.setAssigneeTime(LocalDateTime.now());
			task.setHandleUserId(handlerUserId.toString());
			task.setVehicleId(null);
			task.setAssigneeUserId(assigneeUserId);
			this.updateById(task);
			return R.ok();

			@@ -948,16 +948,7 @@
			throw new RuntimeException("订单状态错误");
			}
			order.setStatus(8);
			// 计算完价格后挑选优惠券
			GetUserCouponDto getUserCouponDto = new GetUserCouponDto();
			getUserCouponDto.setUserId(Long.valueOf(uid));
			getUserCouponDto.setTotalAmount(order.getOrderMoney().doubleValue());
			R<UserCouponVo> userCouponVoR = xpAppUserCouponClient.getUserCoupon(getUserCouponDto);
			UserCouponVo userCouponVo = userCouponVoR.getData();
			if (userCouponVo != null) {
			order.setCouponId(userCouponVo.getId());
			order.setCouponMoney(BigDecimal.valueOf(userCouponVo.getMoney()));
			}
			order.setAppUserId(null);
			order.setTripEnd(LocalDateTime.now());
			baseMapper.updateById(order);
			// 解绑用户与车辆关系
			@@ -1199,6 +1190,7 @@
			.add(order.getLongDistancemoney() != null ? order.getLongDistancemoney() : BigDecimal.ZERO)
			.add(order.getWaitMoney()!=null?order.getWaitMoney():BigDecimal.ZERO);
			order.setOrderMoney(orderMoney);
			order.setAppUserId(null);
			baseMapper.updateById(order);
			if (order.getCouponId() != null) {
			UseUserCouponDto useUserCouponDto = new UseUserCouponDto();
			@@ -1209,10 +1201,18 @@
			useUserCouponDto.setUserCouponId(order.getCouponId());
			xpAppUserCouponClient.useUserCoupon(useUserCouponDto);
			}




			// 计算完价格后挑选优惠券
			GetUserCouponDto getUserCouponDto = new GetUserCouponDto();
			getUserCouponDto.setUserId(Long.valueOf(uid));
			getUserCouponDto.setTotalAmount(order.getOrderMoney().doubleValue());
			R<UserCouponVo> userCouponVoR = xpAppUserCouponClient.getUserCoupon(getUserCouponDto);
			UserCouponVo userCouponVo = userCouponVoR.getData();
			if (userCouponVo != null) {
			order.setCouponId(userCouponVo.getId());
			order.setCouponMoney(BigDecimal.valueOf(userCouponVo.getMoney()));
			}
			order.setAppUserId(null);
			baseMapper.updateById(order);
			// 结束后的车辆操作
			if(vehicle!=null){
			// 生成新的巡游单子回到最新巡游的初始起点位置

	xp-robotaxi-account-boot/src/main/resources/mapper/account/XpOperationsUserMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史