java/NTTravel.git

			@@ -272,7 +272,7 @@
			tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
			userService.updateById(tUser);
			//添加交易明细
			transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
			transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
			} else {
			PaymentRecord query = paymentRecordService.query(1, null, null, tOrderCrossCityId, 3, null, 2).get(0);
			if (null == query) {
			@@ -284,14 +284,14 @@
			return ResultUtil.error(map.get("return_msg"));
			}
			//添加交易明细
			transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
			transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
			}else{//支付宝
			Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
			if(!"10000".equals(map.get("code"))){
			return ResultUtil.error(map.get("msg"));
			}
			//添加交易明细
			transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
			transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
			}
			}

			@@ -331,7 +331,7 @@
			map1.put("id", tOrderCrossCity.getId().toString());
			map1.put("orderType", "3");
			String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
			System.out.println("直通车取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
			System.out.println("跨城取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);

			return SUCCESS_TIP;
			}