java/IgoTravel.git

			@@ -264,10 +264,10 @@
			for (Map<String, Object> map : maps) {
			Integer orderType = Integer.valueOf(map.get("orderType").toString());
			if(1 == orderType){
			map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée");
			map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de course annulée");
			}
			if(4 == orderType){
			map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de livraison");
			map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Delivery order cancelled" : "Commande de livraison annulée");
			}
			}
			List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(language, uid);//专车
			@@ -1760,6 +1760,9 @@
			case 1:
			OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
			Double orderMoney = orderPrivateCar.getOrderMoney();
			if(null == orderMoney){
			orderMoney = 0D;
			}
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
			if(null != query2){
			Integer orderNum=orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId", uid).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			@@ -1775,6 +1778,9 @@
			case 4:
			OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
			Double orderMoney1 = orderLogistics.getOrderMoney();
			if(null == orderMoney1){
			orderMoney1 = 0D;
			}
			UserActivityDiscount1 query1 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId());
			if(null != query1){
			Integer orderNum=orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).eq("activityId",query1.getId()).last(" and to_days(getoffTime) = to_days(now())"));