java/QianYunTong.git

			@@ -2133,7 +2133,18 @@
			if (orderCrossCity.getState() >= 5 && orderCrossCity.getState() != 7 && orderCrossCity.getState() != 11) {
			return ResultUtil.error("订单已取消，请刷新页面");
			}

			//待支付状态需要查询易信判断订单支付状态
			if(7 == orderCrossCity.getState() && ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
			GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
			getPaymentInfoDataRequest1.setPartnerPayId(orderCrossCity.getTravelId());
			GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
			if("2".equals(getPaymentInfo1.getStatus())){
			PaymentRecord query = paymentRecordService.query(1, null, null, id, 3, null, null);
			payOrderCrossCityCallback(orderCrossCity.getId(), getPaymentInfo1.getPayId(), query.getPayType(), null);
			}
			}

			UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId());
			//还原座位
			OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
			CancleOrder query1 = cancleOrderService.query(1, 3, openCity.getId());
			@@ -2192,7 +2203,6 @@
			OrderUtil.tradeOrderCancel(orderCrossCity.getTravelId());
			}

			UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId());
			//已支付的情况下进行退款操作
			if (null != orderCrossCity.getPayType() && null != orderCrossCity.getPayMoney()) {
			// 退款

			@@ -974,19 +974,10 @@


			public void getPaymentStatus(UserInfo userInfo, OrderRide orderRide1){
			GetTravelItineraryListRequest request1 = new GetTravelItineraryListRequest();
			request1.setCustomerId(userInfo.getOnconUUID());
			request1.setOrderNo("SF" + orderRide1.getId());
			ListPage<List<TravelItinerary>> travelItineraryList = OrderUtil.getTravelItineraryList(request1);
			if(travelItineraryList.getList().isEmpty()){
			return;
			}
			TravelItinerary travelItinerary = travelItineraryList.getList().get(0);
			if(travelItinerary.getStatus() != 7 \|\| Arrays.asList(3, 11).contains(travelItinerary.getOrderStatus())){
			GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
			getPaymentInfoDataRequest1.setPartnerPayId(orderRide1.getZttravelId());
			GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);

			GetPaymentInfoDataRequest getPaymentInfoDataRequest1 = new GetPaymentInfoDataRequest();
			getPaymentInfoDataRequest1.setPartnerPayId(orderRide1.getZttravelId());
			GetPaymentInfo getPaymentInfo1 = OrderUtil.paymentInfo(getPaymentInfoDataRequest1);
			if("2".equals(getPaymentInfo1.getStatus())){
			String trade_no = getPaymentInfo1.getPayId();
			Financial financial = new Financial();
			financial.setType(1);//类型 1=收入 2=支出

	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史