java/YueKeDuo.git

			@@ -1148,6 +1148,11 @@
			map.put("id", null);
			// return ResultUtil.success(map);
			}
			}else if(!Integer.valueOf(2).equals(orderPrivateCar.getPaymentMode()) && StrUtil.isEmpty(orderPrivateCar.getPrepaySecondPayNo())){
			UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
			userInfo.setBalance(userInfo.getBalance() + orderPrivateCar.getPayMoney());
			userInfoService.updateById(userInfo);

			}
			Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));
			Integer number2 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));

			@@ -568,6 +568,10 @@
			map.put("id", null);
			return ResultUtil.success(map);
			}
			}else if(!Integer.valueOf(2).equals(orderTaxi.getPaymentMode()) && StrUtil.isEmpty(orderTaxi.getPrepaySecondPayNo())){
			UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
			userInfo.setBalance(userInfo.getBalance() + orderTaxi.getPayMoney());
			userInfoService.updateById(userInfo);
			}
			if (null == orderTaxi.getDriverId()) {//没有接单的情况
			if (orderTaxi.getType() == 2) {//摆渡车

	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史