java/Robotaxi.git

			@@ -349,8 +349,13 @@
			fareVo.setOriginalFare(xpPricingCardVo.getTotalPrice());
			fareVo.setOriginalFareStr(fareVo.getOriginalFare() + "");
			if (userCouponVo != null) {
			fareVo.setDiscountAmount(userCouponVo.getMoney());
			fareVo.setFinalFare(fareVo.getOriginalFare() - fareVo.getDiscountAmount());
			if(userCouponVo.getMoney()>fareVo.getOriginalFare()){
			fareVo.setDiscountAmount(fareVo.getOriginalFare());
			fareVo.setFinalFare(0.0);
			}else {
			fareVo.setDiscountAmount(userCouponVo.getMoney());
			fareVo.setFinalFare(fareVo.getOriginalFare() - fareVo.getDiscountAmount());
			}
			if(fareVo.getFinalFare()>0){
			fareVo.setSystemDiscount(fareVo.getFinalFare());
			fareVo.setFinalFare(0.0);

			@@ -592,8 +592,22 @@

			if (order.getStatus() == 1) {
			order.setStatus(0);
			Long userId = order.getAppUserId();
			order.setAppUserId(null);
			baseMapper.updateById(order);
			// 消息推送
			Map<String, Object> params = new HashMap<>();
			Map<String, Object> content = new HashMap<>();
			content.put("orderId", order.getId().toString());
			content.put("status", OrderStatusEnum.CANCELED.getCode());
			params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
			params.put("content", com.alibaba.fastjson2.JSONObject.toJSONString(content));
			params.put("timestamp", new Date().getTime() + "");
			String message = JSONObject.toJSONString(params);
			SendMessageDTO sendMessageDTO = new SendMessageDTO();
			sendMessageDTO.setMessage(message);
			sendMessageDTO.setAppUserId(String.valueOf(userId));
			xpPushMessageClient.sendStatus(sendMessageDTO);
			return;
			}
			// 1. 更新订单状态为已取消(0)

	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史