java/SuperSaveDriving.git

			@@ -104,6 +104,12 @@
			@Autowired
			private IDivisionRecordService divisionRecordService;

			@Autowired
			private IRechargeRecordService rechargeRecordService;

			@Value("${wx.appletsAppid}")
			private String appletsAppid;

			@Value("${callbackPath}")
			private String callbackPath;//支付回调网关地址

			@@ -181,6 +187,8 @@





			/**
			* 获取订单价格
			* @param type 计算类型（1=预估价，2=订单费）
			@@ -191,6 +199,7 @@
			* @return
			*/
			public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
			distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
			order = getOrderInitialPrice(order);
			SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
			if(null == systemConfig){
			@@ -206,7 +215,7 @@
			JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
			JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
			Date date = new Date();
			for (int i = 0; i < chargeStandard.size(); i++) {
			for (int i = 0; i < chargeStandard.size(); i++) {//计算各个时段
			JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
			String num1 = jsonObject1.getString("num1");
			String num2 = jsonObject1.getString("num2");
			@@ -221,41 +230,57 @@
			Double num11 = jsonObject1.getDouble("num11");//超过num8每num10公里收取num11

			String[] split = num1.split(":");
			Integer hour1 = Integer.valueOf(split[0]);
			String[] split1 = num2.split(":");
			Integer hour2 = Integer.valueOf(split1[0]);

			Calendar s = Calendar.getInstance();
			s.setTime(date);
			s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
			s.set(Calendar.HOUR_OF_DAY, hour1);
			s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
			s.set(Calendar.SECOND, 0);

			split = num2.split(":");
			Calendar e = Calendar.getInstance();
			e.setTime(date);
			e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
			e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
			e.set(Calendar.HOUR_OF_DAY, hour2);
			e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
			e.set(Calendar.SECOND, 0);

			if(hour1 > hour2){
			if(s.getTimeInMillis() > date.getTime()){
			s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
			}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){//起步里程内
			order.setStartDistance(distance);//起步里程
			order.setStartPrice(num4);//起步价
			}else{
			BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3));//超出起步里程
			BigDecimal divide = subtract.divide(new BigDecimal(num5), new MathContext(2, RoundingMode.HALF_EVEN));
			BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3)).setScale(2, BigDecimal.ROUND_HALF_EVEN);//超出起步里程
			BigDecimal divide = subtract.divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
			BigDecimal multiply = divide.multiply(new BigDecimal(num6));
			order.setStartDistance(num3);//起步里程
			order.setStartPrice(num4);//起步价
			order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
			order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费

			//计算长途费
			//计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
			if(distance.compareTo(num7) > 0){
			order.setStartDistance(0D);//起步里程
			order.setStartPrice(0D);//起步价
			order.setOverDriveDistance(0D);//超出起步里程
			order.setOverDrivePrice(0D);//超出起步里程费

			order.setLongDistance(num7 + "-" + num8);//长途里程
			order.setLongDistancePrice(num9);//长途费
			}
			//计算长途里程超出的部分
			if(distance.compareTo(num8) > 0){
			BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8));
			BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), new MathContext(2, RoundingMode.HALF_EVEN));
			BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
			BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
			order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
			order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
			@@ -348,7 +373,7 @@
			order.setLongDistancePrice(0D);//长途里程费
			order.setOverLongDistance(0D);//超出长途里程
			order.setOverLongDistancePrice(0d);//超出长途里程费
			order.setWaitTime(0);//等待时长
			// order.setWaitTime(0);//等待时长
			order.setWaitTimePrice(0D);//等待费
			order.setOutWaitTime(0);//超出等待时长
			order.setOutWaitTimePrice(0D);//超出等待时长费
			@@ -519,6 +544,10 @@
			if(driver1.getServerStatus() == 2 \|\| driver1.getOpenOrderQRCode() == 1){
			continue;
			}
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
			if(null == driverWork){
			continue;
			}
			Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
			Double wgs84 = distance.get("WGS84");
			if(d == null \|\| d.compareTo(wgs84) > 0){
			@@ -564,6 +593,11 @@
			if(ToolUtil.isEmpty(value)){
			continue;
			}
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
			if(null == driverWork){
			continue;
			}

			if(integral == null \|\| integral.compareTo(driver1.getIntegral()) < 0){//积分大
			integral = driver1.getIntegral();
			score = driver1.getScore();
			@@ -609,14 +643,53 @@
			if(order1.getState() == 101 \|\| order1.getState() == 201){
			order1.setHallOrder(1);
			OrderServiceImpl.this.updateById(order1);
			ExtraPushOrder(order);
			}
			}
			}, num4 * 1000);
			}else{
			order.setHallOrder(1);
			this.updateById(order);
			ExtraPushOrder(order);
			}
			}



			public void ExtraPushOrder(Order order){
			String startLat = order.getStartLat();
			String startLng = order.getStartLng();

			//找到中心点
			GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
			Double num = 5D;//范围公里
			//构造半径
			Distance distanceR = new Distance(num, Metrics.KILOMETERS);
			//画圆
			Circle circle = new Circle(geoJsonPoint, distanceR);
			// 构造query对象
			Query query = Query.query(Criteria.where("location").withinSphere(circle));
			List<Location> locations = mongoTemplate.find(query, Location.class);
			List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
			if(driverIds.size() == 0){
			return;
			}
			List<DriverWork> tDriverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", driverIds).eq("status", 1));
			driverIds = tDriverWorks.stream().map(DriverWork::getDriverId).collect(Collectors.toList());
			List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
			.eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
			if(drivers.size() == 0){
			return;
			}
			for (Driver driver1 : drivers) {
			String value = redisUtil.getValue("DRIVER" + driver1.getId());
			if (ToolUtil.isEmpty(value)) {
			return;
			}
			pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
			}
			}



			/**
			@@ -748,8 +821,13 @@
			@Override
			public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
			Order order = this.selectById(orderId);
			Coupon coupon = userToCouponService.queryCoupon(uid, order.getOrderMoney());
			OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
			BeanUtils.copyProperties(order, orderPriceWarpper);
			if(null != coupon){
			orderPriceWarpper.setCouponId(coupon.getId());
			orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
			}
			orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
			return orderPriceWarpper;
			@@ -886,19 +964,15 @@
			order.setPayMoney(payMoney);
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String out_trade_no = sdf.format(new Date()) + order.getId();
			// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
			// this.updateById(order);



			PaymentOrder paymentOrder = new PaymentOrder();
			paymentOrder.setBizOrderId(out_trade_no);
			paymentOrder.setAmount(String.valueOf(payMoney * 100));
			paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
			paymentOrder.setOrderName("代驾服务费");
			paymentOrder.setPayType("WX_MINI");
			paymentOrder.setTransferType("0");
			paymentOrder.setAsynSplitFlag("1");
			paymentOrder.setAppid("");
			paymentOrder.setAppid(appletsAppid);
			paymentOrder.setOpenid(appUser.getOpenid());
			paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
			List<PaymentOrderGood> goodsDetail = new ArrayList<>();
			@@ -906,13 +980,13 @@
			paymentOrderGood.setGoodsName("服务费");
			goodsDetail.add(paymentOrderGood);
			paymentOrder.setGoodsDetail(goodsDetail);
			paymentOrder.setFrontUrl("");
			paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
			paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
			paymentOrder.setParameter1(order.getId().toString());

			TrhRequest<PaymentOrder> request = new TrhRequest();
			InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
			if(!"0000".equals(execute.getResult())){
			if(!"0000".equals(execute.getCode())){
			return ResultUtil.error(execute.getMsg());
			}
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			@@ -920,11 +994,57 @@
			if("2".equals(status)){
			return ResultUtil.error("失败");
			}
			if("0".equals(status)){
			return ResultUtil.error("处理中");
			}
			String merOrderId = jsonObject.getString("merOrderId");
			String payCode = jsonObject.getString("payCode");
			this.updateById(order);

			if(ToolUtil.isNotEmpty(payCode)){
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10){
			int min = 5000;
			wait += (min * num);
			Order order1 = OrderServiceImpl.this.selectById(order.getId());
			if(order1.getState() != 107){
			return;
			}
			QueryOrder queryOrder = new QueryOrder();
			queryOrder.setOriginalMerOrderId(merOrderId);
			queryOrder.setQueryType("1");
			TrhRequest<QueryOrder> request = new TrhRequest();
			InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
			if("0000".equals(execute1.getCode())){
			JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
			String status1 = jsonObject1.getString("status");
			if("0".equals(status1)){//待处理
			Thread.sleep(wait);
			num++;
			}
			if("1".equals(status1)){//成功
			String merOrderId = jsonObject1.getString("merOrderId");
			ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);

			break;
			}
			if("2".equals(status1) \|\| 10 == num){//失败
			break;
			}
			}else{
			Thread.sleep(wait);
			num++;
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}

			return ResultUtil.success(payCode);
			}

			@@ -953,22 +1073,22 @@
			accountChangeDetail.setUserType(2);
			accountChangeDetail.setUserId(order.getDriverId());
			accountChangeDetail.setCreateTime(new Date());
			accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(7);
			accountChangeDetail.setOrderId(order.getId());
			accountChangeDetail.setExplain("优惠券收入");
			driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
			accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
			accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
			driverService.updateById(driver);
			accountChangeDetailService.insert(accountChangeDetail);
			}
			}

			if(appUser.getHavDiscount() == 1){//9折
			payMoney = payMoney * 0.9;
			order.setDiscount(9D);
			order.setDiscountAmount(payMoney * 0.1);
			if(appUser.getHavDiscount() == 1){//9.5折
			order.setDiscount(9.5D);
			order.setDiscountAmount(payMoney * 0.05);
			payMoney = payMoney * 0.95;
			}

			order.setPayType(2);
			@@ -1026,10 +1146,27 @@
			payMoney = payMoney - coupon.getCouponPreferentialAmount();
			order.setCouponId(coupon.getId());
			order.setDiscountedPrice(coupon.getCouponPreferentialAmount());

			Driver driver = driverService.selectById(order.getDriverId());
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
			accountChangeDetail.setUserType(2);
			accountChangeDetail.setUserId(order.getDriverId());
			accountChangeDetail.setCreateTime(new Date());
			accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(7);
			accountChangeDetail.setOrderId(order.getId());
			accountChangeDetail.setExplain("优惠券收入");
			driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
			accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
			driverService.updateById(driver);
			accountChangeDetailService.insert(accountChangeDetail);
			}
			}
			order.setPayType(1);
			order.setPayMoney(payMoney);
			order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);

			payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;

			@@ -1051,16 +1188,15 @@
			if(0 < payMoney){//还需要调起微信支付
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String out_trade_no = sdf.format(new Date()) + order.getId();
			// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());

			PaymentOrder paymentOrder = new PaymentOrder();
			paymentOrder.setBizOrderId(out_trade_no);
			paymentOrder.setAmount(String.valueOf(payMoney * 100));
			paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
			paymentOrder.setOrderName("代驾服务费");
			paymentOrder.setPayType("WX_MINI");
			paymentOrder.setTransferType("0");
			paymentOrder.setAsynSplitFlag("1");
			paymentOrder.setAppid("");
			paymentOrder.setAppid(appletsAppid);
			paymentOrder.setOpenid(appUser.getOpenid());
			paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
			List<PaymentOrderGood> goodsDetail = new ArrayList<>();
			@@ -1068,13 +1204,14 @@
			paymentOrderGood.setGoodsName("服务费");
			goodsDetail.add(paymentOrderGood);
			paymentOrder.setGoodsDetail(goodsDetail);
			paymentOrder.setFrontUrl("");
			paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
			paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
			paymentOrder.setParameter1(order.getId().toString());
			paymentOrder.setParameter2(accountChangeDetail.getId().toString());

			TrhRequest<PaymentOrder> request = new TrhRequest();
			InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
			if(!"0000".equals(execute.getResult())){
			if(!"0000".equals(execute.getCode())){
			return ResultUtil.error(execute.getMsg());
			}
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			@@ -1082,95 +1219,72 @@
			if("2".equals(status)){
			return ResultUtil.error("失败");
			}
			if("0".equals(status)){
			return ResultUtil.error("处理中");
			}
			String merOrderId = jsonObject.getString("merOrderId");
			String payCode = jsonObject.getString("payCode");
			this.updateById(order);

			if(ToolUtil.isNotEmpty(payCode)){
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10){
			int min = 5000;
			wait += (min * num);
			Order order1 = OrderServiceImpl.this.selectById(order.getId());
			if(order1.getState() != 107){
			return;
			}
			QueryOrder queryOrder = new QueryOrder();
			queryOrder.setOriginalMerOrderId(merOrderId);
			queryOrder.setQueryType("1");
			TrhRequest<QueryOrder> request = new TrhRequest();
			InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
			if("0000".equals(execute1.getCode())){
			JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
			String status1 = jsonObject1.getString("status");
			if("0".equals(status1)){//待处理
			Thread.sleep(wait);
			num++;
			}
			if("1".equals(status1)){//成功
			String merOrderId = jsonObject1.getString("merOrderId");
			ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);

			break;
			}
			if("2".equals(status1) \|\| 10 == num){//失败
			Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
			AppUser appUser1 = appUserService.selectById(order1.getUserId());
			appUser1.setAccountBalance(appUser1.getAccountBalance() + m);
			appUserService.updateById(appUser1);
			accountChangeDetailService.deleteById(accountChangeDetail.getId());
			break;
			}
			}else{
			Thread.sleep(wait);
			num++;
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}
			return ResultUtil.success(payCode);
			}else{
			order.setPayType(2);
			order.setPayMoney(payMoney);
			order.setPayTime(new Date());
			order.setState(108);
			this.updateById(order);

			// TODO: 2023/5/18 取消支付后需要处理优惠券数据回退
			//
			//
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// try {
			// int num = 1;
			// int wait = 0;
			// while (num <= 10){
			// int min = 5000;
			// wait += (min * num);
			// Order order1 = OrderServiceImpl.this.selectById(order.getId());
			// if(order1.getState() != 107){
			// return;
			// }
			//
			// /**
			// * SUCCESS--支付成功
			// * REFUND--转入退款
			// * NOTPAY--未支付
			// * CLOSED--已关闭
			// * REVOKED--已撤销(刷卡支付)
			// * USERPAYING--用户支付中
			// * PAYERROR--支付失败(其他原因，如银行返回失败)
			// * ACCEPT--已接收，等待扣款
			// */
			// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
			// if(resultUtil.getCode() == 200){
			// Map<String, String> map = resultUtil.getData();
			// String trade_type = map.get("trade_type");
			// String trade_state = map.get("trade_state");
			// String transaction_id = map.get("transaction_id");
			// if("REFUND".equals(trade_state) \|\| "NOTPAY".equals(trade_state) \|\| "CLOSED".equals(trade_state) \|\| "REVOKED".equals(trade_state) \|\| "PAYERROR".equals(trade_state)){
			// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
			// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
			// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
			// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
			// appUserService.updateById(appUser1);
			//
			// accountChangeDetailService.deleteById(accountChangeDetail.getId());
			// return;
			// }
			// if("SUCCESS".equals(trade_state)){
			// order1.setPayTime(new Date());
			// order1.setState(108);
			// order1.setOrderNo(transaction_id);
			// OrderServiceImpl.this.updateById(order1);
			//
			// //处理抽成及收入
			// saveCommission(order1);
			// return;
			// }
			// if("USERPAYING".equals(trade_state) \|\| "ACCEPT".equals(trade_state)){
			// Thread.sleep(wait);
			// num++;
			// }
			// }else{
			// Thread.sleep(wait);
			// num++;
			// }
			// if(10 == num){
			// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
			// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
			// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
			// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
			// appUserService.updateById(appUser1);
			//
			// accountChangeDetailService.deleteById(accountChangeDetail.getId());
			// }
			// }
			// }catch (Exception e){
			// e.printStackTrace();
			// }
			// }
			// }).start();
			// return weixinpay;
			//处理佣金和收入记录
			saveCommission(order);
			}
			// order.setPayTime(new Date());
			// this.updateById(order);


			return ResultUtil.success();

			}
			@@ -1201,135 +1315,6 @@
			pushOrderInfoWarpper.setState(order.getState());
			pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
			}

			//支付成功---->异步分账----->10s钟后再进行确认收货
			//确认收货后才能进行提现（结算接口）
			//异步分账
			List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("orderId", order.getId()));
			Complete complete = new Complete();
			complete.setOriginalMerOrderId(transaction_id);
			complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
			List<PamentOrderUser> splitList = new ArrayList<>();
			for (Revenue revenue : revenues) {
			if(revenue.getUserType() == 2){//司机
			Driver driver = driverService.selectById(revenue.getUserId());
			PamentOrderUser pamentOrderUser = new PamentOrderUser();
			pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
			pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
			pamentOrderUser.setSplitType("2");
			splitList.add(pamentOrderUser);

			DivisionRecord divisionRecord = new DivisionRecord();
			divisionRecord.setUserType(1);
			divisionRecord.setUserId(revenue.getUserId());
			divisionRecord.setOrderId(order.getId());
			divisionRecord.setMerOrderId(transaction_id);
			divisionRecord.setSourceType(1);
			divisionRecord.setAmount(revenue.getAmount());
			divisionRecord.setMerchantNumber(driver.getMerchantNumber());
			divisionRecord.setState(1);
			divisionRecord.setCreateTime(new Date());
			divisionRecordService.insert(divisionRecord);
			}
			if(revenue.getUserType() == 3){//代理商
			Agent agent = agentService.selectById(revenue.getUserId());
			PamentOrderUser pamentOrderUser = new PamentOrderUser();
			pamentOrderUser.setSplitUserId(agent.getMerchantNumber());
			pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
			pamentOrderUser.setSplitType("2");
			splitList.add(pamentOrderUser);

			DivisionRecord divisionRecord = new DivisionRecord();
			divisionRecord.setUserType(2);
			divisionRecord.setUserId(revenue.getUserId());
			divisionRecord.setOrderId(order.getId());
			divisionRecord.setMerOrderId(transaction_id);
			divisionRecord.setSourceType(1);
			divisionRecord.setAmount(revenue.getAmount());
			divisionRecord.setMerchantNumber(agent.getMerchantNumber());
			divisionRecord.setState(1);
			divisionRecord.setCreateTime(new Date());
			divisionRecordService.insert(divisionRecord);
			}

			}
			complete.setSplitList(splitList);
			TrhRequest<Complete> request = new TrhRequest();
			InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
			if(!"0000".equals(execute.getResult())){
			return ResultUtil.error(execute.getMsg());
			}
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			String status = jsonObject.getString("status");
			if("2".equals(status)){
			return ResultUtil.error("失败");
			}
			if("0".equals(status)){
			return ResultUtil.error("处理中");
			}

			//使用优惠券的情况，通过转账接口将优惠券的收入转到司机电子账簿
			if(null != order.getCouponId()){
			List<PlatformRechargeRecord> platformRechargeRecords = platformRechargeRecordService.selectList(new EntityWrapper<PlatformRechargeRecord>().eq("state", 2).last(" and balance > 0 order by payTime"));
			Double discountedPrice = order.getDiscountedPrice();
			Driver driver = driverService.selectById(order.getDriverId());

			UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
			Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
			accountChangeDetail.setUserType(2);
			accountChangeDetail.setUserId(order.getDriverId());
			accountChangeDetail.setCreateTime(new Date());
			accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(7);
			accountChangeDetail.setOrderId(order.getId());
			accountChangeDetail.setExplain("优惠券收入");
			driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
			accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			driverService.updateById(driver);
			accountChangeDetailService.insert(accountChangeDetail);


			for (PlatformRechargeRecord platformRechargeRecord : platformRechargeRecords) {
			if(discountedPrice == 0){
			break;
			}

			if(platformRechargeRecord.getBalance().compareTo(discountedPrice) >= 0){
			discountedPrice = 0D;
			platformRechargeRecord.setBalance(platformRechargeRecord.getBalance() - discountedPrice);
			platformRechargeRecordService.updateById(platformRechargeRecord);
			}else{

			}

			Transfer transfer = new Transfer();
			transfer.setDepositMerOrderId("6831518911582834611");
			transfer.setToUserId(driver.getMerchantNumber());
			transfer.setAmount(discountedPrice.toString());
			transfer.setOrderName("");
			transfer.setNotifyUrl("");
			transfer.setParameter1(order.getId().toString());

			TrhRequest<Transfer> request1 = new TrhRequest();
			InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
			if(!"0000".equals(execute1.getResult())){
			return ResultUtil.error(execute1.getMsg());
			}
			JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
			String status1 = jsonObject1.getString("status");
			if("2".equals(status1)){
			return ResultUtil.error("失败");
			}
			if("0".equals(status1)){
			return ResultUtil.error("处理中");
			}
			}
			}


			return ResultUtil.success();
			}

			@@ -1373,7 +1358,7 @@
			if(null != systemConfig){
			//{"num1":"10:00","num2":"14:00","num3":10,"num4":10,"num5":10,"num6":10,"num7":10,"num8":10,"num9":5,"num10":5}
			JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
			Integer num5 = jsonObject.getInteger("num5");
			Integer num5 = jsonObject.getInteger("num6");

			//增加积分变动记录
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			@@ -1426,20 +1411,46 @@
			//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
			Driver driver = driverService.selectById(order.getDriverId());
			AppUser appUser = appUserService.selectById(order.getUserId());
			Double payMoney = order.getPayMoney();

			//首单积分奖励
			//司机推荐首单收入
			List<Integer> state = Arrays.asList(107, 108, 109);
			int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
			if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
			Driver driver1 = driverService.selectById(appUser.getInviterId());
			SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
			JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
			Integer num4 = jsonObject2.getInteger("num4");
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
			accountChangeDetail.setUserType(2);
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(2);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOrderId(order.getId());
			accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
			accountChangeDetail.setExplain("邀请用户首单积分奖励");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setIntegral(driver1.getIntegral() + num4);
			accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
			accountChangeDetailService.insert(accountChangeDetail);
			driverService.updateById(driver1);
			}



			Double payMoney = order.getPayMoney();//todo 司机订单收入归并到佣金中一起提现
			SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
			if(null != systemConfig){
			JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
			Double num2 = jsonObject.getDouble("num2");
			Double num3 = jsonObject.getDouble("num3");
			if(order.getPayMoney() >= num2){
			if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
			payMoney = payMoney - num3;//司机收入
			SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
			if(null != systemConfig1){
			JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
			//司机推荐首单收入
			List<Integer> state = Arrays.asList(108, 109);
			int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
			if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
			Double num1 = jsonObject1.getDouble("num1");
			num1 = (num3 >= num1 ? num1 : num3);
			@@ -1452,11 +1463,11 @@
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("邀请用户首单奖励");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num1);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);

			@@ -1468,12 +1479,36 @@
			revenue.setAmount(num1);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			//补贴中分账
			Double num1_ = num1;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num1_) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num1_, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num1_ -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}
			}
			num3 = (num3 >= num1 ? num3 - num1 : 0);
			}

			//开始处理层级抽佣
			if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
			if(num3 > 0 && null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
			Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
			if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
			Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
			@@ -1499,13 +1534,38 @@
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num5);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num5_ = num5;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num5_) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num5_, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num5_ -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			num3 = (num3 >= num5 ? num3 - num5 : 0);
			}
			num6 = (num3 >= num6 ? num6 : num3);
			@@ -1525,13 +1585,39 @@
			accountChangeDetail.setUserId(driver2.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver2.setCommission(driver2.getCommission() + num6);
			accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
			driverService.updateById(driver2);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num6_ = num6;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num6_) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num6_, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num6_ -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}


			num3 = (num3 >= num6 ? num3 - num6 : 0);
			}
			num7 = (num3 >= num7 ? num7 : num3);
			@@ -1551,13 +1637,38 @@
			accountChangeDetail.setUserId(driver3.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
			accountChangeDetail.setOldData(driver3.getCouponBalance() + driver3.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver3.setCommission(driver3.getCommission() + num7);
			accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
			accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
			driverService.updateById(driver3);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num7_ = num7;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num7_) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), num7_, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num7_ -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			num3 = (num3 >= num7 ? num3 - num7 : 0);
			}
			}else{
			@@ -1580,13 +1691,38 @@
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num3_);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num3_1 = num3_;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num3_1) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num3_1 -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			num3 = (num3 >= num3_ ? num3 - num3_ : 0);
			}
			num4 = (num3 >= num4 ? num4 : num3);
			@@ -1606,13 +1742,38 @@
			accountChangeDetail.setUserId(driver2.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver2.setCommission(driver2.getCommission() + num4);
			accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
			driverService.updateById(driver2);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num4_1 = num4;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num4_1) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num4_1, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num4_1 -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			num3 = (num3 >= num4 ? num3 - num4 : 0);
			}
			}
			@@ -1635,13 +1796,38 @@
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num2_);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);

			//补贴中分账
			Double num2_1 = num2_;
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num2_1) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num2_1, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num2_1 -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			num3 = (num3 >= num2_ ? num3 - num2_ : 0);
			}
			}
			@@ -1656,17 +1842,45 @@
			revenue.setAmount(num3);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			Agent agent = agentService.selectById(driver.getAgentId());
			Double num3_1 = num3;

			//补贴中分账
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(num3_1) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			num3_1 -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}
			}
			}
			}
			}

			driver = driverService.selectById(order.getDriverId());
			//司机订单收入
			Revenue revenue = new Revenue();
			revenue.setType(1);
			revenue.setUserType(2);
			revenue.setUserId(driver.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(payMoney + order.getDiscountedPrice());
			revenue.setAmount(payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1677,20 +1891,330 @@
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(1);
			accountChangeDetail.setOrderId(order.getId());
			accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
			driver.setCommission(driver.getCommission() + payMoney);
			accountChangeDetail.setExplain("订单收入");
			accountChangeDetail.setCreateTime(new Date());
			driver.setBalance(driver.getBalance() + payMoney);
			if(null != order.getCouponId()){
			driver.setCouponBalance(driver.getCouponBalance() + order.getDiscountedPrice());
			driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
			//补贴中分账
			Double discountedPrice = order.getDiscountedPrice();
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			discountedPrice -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			}
			accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
			if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
			driver.setCommission(driver.getCommission() + order.getDiscountAmount());
			//补贴中分账
			Double discountedPrice = order.getDiscountAmount();
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(order.getDiscountAmount()) >= 0){
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
			if(10000 == zhaunzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			discountedPrice -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}
			}
			accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
			driverService.updateById(driver);
			accountChangeDetailService.saveData(accountChangeDetail);

			//支付成功---->异步分账----->10s钟后再进行确认收货
			//确认收货后才能进行提现（结算接口）
			//异步分账

			if(order.getPayType() == 1){//微信支付
			//分账司机收入
			fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);

			if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
			Double money = order.getPayMoney() - payMoney + order.getDiscountedPrice();
			fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
			}
			}
			if(order.getPayType() == 2){//余额支付(使用用户的充值数据分账)
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
			.eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(payMoney) >= 0){
			//分账司机收入
			ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), payMoney, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - payMoney);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			payMoney -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}



			if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
			Double money = order.getPayMoney() - payMoney;

			List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
			.eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords1) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(money) >= 0){
			//分账司机收入
			ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), money, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			payMoney -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}
			}
			}

			if(order.getPayType() == 4){//微信+余额(使用用户的充值数据分账)
			Double xj = order.getPayMoney() - order.getBalancePayment();
			if(xj > 0){
			//分账司机收入
			fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);

			if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
			Double money = order.getPayMoney() - payMoney + order.getDiscountedPrice();
			fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
			}
			}else{
			Double balancePayment = order.getBalancePayment();
			List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
			.eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(balancePayment) >= 0){
			//分账司机收入
			ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), balancePayment, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - balancePayment);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			balancePayment -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}

			if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
			Double money = order.getPayMoney() - payMoney;

			List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
			.eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
			for (RechargeRecord rechargeRecord : rechargeRecords1) {
			Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
			if(surplusDividedAmount.compareTo(money) >= 0){
			//分账司机收入
			ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), money, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
			rechargeRecordService.updateById(rechargeRecord);
			}
			break;
			}else{
			ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
			if(10000 == fengzhang.getCode()){
			rechargeRecord.setSurplusDividedAmount(0D);
			rechargeRecordService.updateById(rechargeRecord);
			payMoney -= surplusDividedAmount;
			}else{
			break;
			}
			}
			}
			}
			}
			}
			}


			/**
			* 分账操作
			* @param amount
			*/
			public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
			DivisionRecord divisionRecord = new DivisionRecord();
			divisionRecord.setUserType(userType);
			divisionRecord.setUserId(id);
			divisionRecord.setOrderId(orderId);
			divisionRecord.setSourceType(sourceType);
			divisionRecord.setAmount(amount);
			divisionRecord.setMerchantNumber(merchantNumber);
			divisionRecord.setState(1);
			divisionRecord.setCreateTime(new Date());
			divisionRecordService.insert(divisionRecord);

			Complete complete = new Complete();
			complete.setOriginalMerOrderId(merOrderId);
			complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
			complete.setParameter1(divisionRecord.getId().toString());
			//分账方列表
			List<PamentOrderUser> splitList = new ArrayList<>();
			PamentOrderUser pamentOrderUser = new PamentOrderUser();
			pamentOrderUser.setSplitUserId(merchantNumber);
			pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
			pamentOrderUser.setSplitType("1");
			splitList.add(pamentOrderUser);
			complete.setSplitList(splitList);
			TrhRequest<Complete> request = new TrhRequest();
			InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
			if("0000".equals(execute.getCode())){
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
			String merOrderId1 = jsonObject.getString("merOrderId");
			if(2 == status){
			System.err.println("订单支付成功后的分账处理异常失败");
			return ResultUtil.error("订单支付成功后的分账处理异常失败");
			}
			if(1 == status){
			divisionRecord.setMerOrderId(merOrderId1);
			divisionRecord.setPayTime(new Date());
			divisionRecord.setState(2);
			divisionRecordService.updateById(divisionRecord);
			//间隔10秒开始调用确认收货后开始提现

			new Timer().schedule(new TimerTask() {//确认收货和提现
			@Override
			public void run() {
			confirmReceipt(merchantNumber, merOrderId, divisionRecord);
			}
			}, 15000);
			return ResultUtil.success();
			}
			}else{
			System.err.println("订单支付成功后的分账处理异常：" + execute.getMsg());
			return ResultUtil.error("订单支付成功后的分账处理异常：" + execute.getMsg());
			}
			return ResultUtil.error("未知异常");
			}




			/**
			* 分账后的确认收货
			* @param divisionRecord
			*/
			public void confirmReceipt(String merchantNumber, String orderNumber, DivisionRecord divisionRecord){
			Receive receive = new Receive();
			receive.setOriginalMerOrderId(orderNumber);
			receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
			receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
			List<ReceiveUser> splitList = new ArrayList<>();
			ReceiveUser receiveUser = new ReceiveUser();
			receiveUser.setSplitUserId(merchantNumber);
			receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
			splitList.add(receiveUser);
			receive.setSplitList(splitList);
			TrhRequest<Receive> request = new TrhRequest();
			InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
			if("0000".equals(execute1.getCode())){
			JSONObject jsonObject = JSON.parseObject(execute1.getResult());
			String merOrderId = jsonObject.getString("merOrderId");
			System.err.println("分账确认收货成功");
			}else{
			System.err.println("分账确认收货异常" + execute1.getMsg());
			}
			}


			/**
			* 转账
			* @param id
			* @param merOrderId
			* @param toUserId
			* @param amount
			* @param notifyUrl
			* @return
			*/
			public ResultUtil zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
			Transfer transfer = new Transfer();
			transfer.setDepositMerOrderId(merOrderId);
			transfer.setToUserId(toUserId);
			transfer.setAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
			transfer.setOrderName("补贴");
			transfer.setNotifyUrl(notifyUrl);
			transfer.setParameter1(id.toString());
			TrhRequest<Transfer> request = new TrhRequest();
			InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
			if("0000".equals(execute.getCode())){
			JSONObject jsonObject = JSON.parseObject(execute.getResult());
			Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
			if(2 == status){
			System.err.println("转账失败");
			return ResultUtil.error("转账失败");
			}
			return ResultUtil.success();
			}else{
			System.err.println("转账失败：" + execute.getMsg());
			return ResultUtil.error(execute.getMsg());
			}
			}



			/**
			* 获取乘客行程
			* @param uid
			* @param pageNum