java/SuperSaveDriving.git

			@@ -247,14 +247,14 @@
			* @param city 查询天气的城市
			* @return
			*/
			public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
			public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city) {
			order = getOrderInitialPrice(order);
			SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
			if(null == systemConfig){
			if(type == 1){//预估金额
			if (null == systemConfig) {
			if (type == 1) {//预估金额
			order.setEstimatedPrice(0D);
			}
			if(type == 2){//订单金额
			if (type == 2) {//订单金额
			order.setOrderMoney(0D);
			}
			return order;
			@@ -294,19 +294,19 @@
			e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
			e.set(Calendar.SECOND, 0);

			if(hour1 > hour2){
			if(s.getTimeInMillis() > date.getTime()){
			if (hour1 > hour2) {
			if (s.getTimeInMillis() > date.getTime()) {
			s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
			}else{
			} else {
			e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
			}
			}

			if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
			if(num3.compareTo(distance) >= 0){//起步里程内
			if (date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()) {
			if (num3.compareTo(distance) >= 0) {//起步里程内
			order.setStartDistance(distance);//起步里程
			order.setStartPrice(num4);//起步价
			}else{
			} else {
			Double distance1 = distance;//原始里程
			order.setStartDistance(num3);//起步里程
			order.setStartPrice(num4);//起步价
			@@ -318,7 +318,7 @@
			order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费

			//计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
			if(distance.compareTo(num7) > 0){
			if (distance.compareTo(num7) > 0) {
			order.setStartDistance(0D);//起步里程
			order.setStartPrice(0D);//起步价
			order.setOverDriveDistance(0D);//超出起步里程
			@@ -328,7 +328,7 @@
			order.setLongDistancePrice(num9);//长途费
			}
			//计算长途里程超出的部分
			if(distance.compareTo(num8) > 0){
			if (distance.compareTo(num8) > 0) {
			order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程

			BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
			@@ -352,7 +352,7 @@
			Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额

			//等待费用
			if(waitTime.compareTo(num1 * 60) >= 0){
			if (waitTime.compareTo(num1 * 60) >= 0) {
			order.setWaitTime(num1 * 60);//等待时长
			order.setWaitTimePrice(num2);//等待费用

			@@ -364,15 +364,15 @@

			//恶劣天气
			systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
			if(null != systemConfig) {
			if (null != systemConfig) {
			JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
			Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
			if(1 == num11){
			if (1 == num11) {
			boolean badWeather = WeatherUtil.isBadWeather(city);
			if(badWeather){
			if (badWeather) {
			order.setBadWeatherDistance(num5);//恶劣天气公里
			order.setBadWeatherPrice(num6);//恶劣天气费
			if(distance.compareTo(num7) > 0){
			if (distance.compareTo(num7) > 0) {
			BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
			BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
			order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
			@@ -380,36 +380,39 @@
			}

			double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(num9.compareTo(add) < 0){//超出最高金额（重新调整金额）
			if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
			if (num9.compareTo(add) < 0) {//超出最高金额（重新调整金额）
			if (num9.compareTo(num6) < 0) {//如果恶劣天气费大于最高金额
			order.setBadWeatherPrice(num9);//恶劣天气费
			order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
			}else{
			} else {
			BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
			order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
			}
			}
			}
			}
			}


			//计算折扣
			if(null != order.getUserId()){
			//计算折扣
			if (null != order.getUserId()) {

			}
			}

			//计算总金额
			BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
			order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			//计算总金额
			BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
			order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);

			if(type == 1){//预估价
			order.setEstimatedPrice(bigDecimal.doubleValue());
			}
			if(type == 2){//订单金额
			order.setOrderMoney(bigDecimal.doubleValue());
			if (type == 1) {//预估价
			order.setEstimatedPrice(bigDecimal.doubleValue());
			}
			if (type == 2) {//订单金额
			order.setOrderMoney(bigDecimal.doubleValue());
			}
			return order;
			}
			return order;
			}



			/**
			@@ -1147,7 +1150,7 @@
			* @throws Exception
			*/
			@Override
			public ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception {
			public ResultUtil transferOrder(Integer uid, Long orderId, String cause, String phone) throws Exception {
			// 7.13改动
			OrderTransfer orderTransfer = new OrderTransfer();
			Order order = this.selectById(orderId);
			@@ -1190,7 +1193,7 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushOrder(finalOrder);
			pushOrder(finalOrder.getId());
			}
			}).start();
			}