java/NTTravel.git

			@@ -28,6 +28,9 @@
			import java.io.FileInputStream;
			import java.io.InputStreamReader;
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -87,7 +90,7 @@
			* 跳转到查看跨城出行订单详情页面
			*/
			@RequestMapping("/tOrderCrossCity_detail/{tOrderCrossCityId}")
			public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) {
			public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) throws ParseException {
			Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderCrossCityId);
			model.addAttribute("item",item);
			List<OrderFrequentPassengers> orderFrequentPassengers = orderFrequentPassengersService.selectList(new EntityWrapper<OrderFrequentPassengers>().eq("orderType", 3).eq("orderId", tOrderCrossCityId));
			@@ -97,6 +100,19 @@
			frequentPassengers = frequentPassengersService.selectBatchIds(collect);
			}
			model.addAttribute("frequentPassengers",frequentPassengers);
			if(Objects.nonNull(item.get("routeRecord"))){
			List<String> routeRecordList = Arrays.asList(item.get("routeRecord").toString().split(","));
			model.addAttribute("routeRecordList",routeRecordList);
			}
			if(Objects.nonNull(item.get("routeRecord")) && Objects.nonNull(item.get("recordTime"))){
			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			LocalDateTime recordTime = DateUtil.dateToLocalDateTime(format.parse(item.get("recordTime").toString()));
			if(LocalDateTime.now().isBefore(recordTime.plusMonths(1))){
			model.addAttribute("recordState",1);
			}else {
			model.addAttribute("recordState",2);
			}
			}
			return PREFIX + "tOrderCrossCity_detail.html";
			}

			@@ -256,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) {
			@@ -268,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());
			}
			}

			@@ -315,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;
			}