java/IgoTravel.git

			@@ -100,6 +100,9 @@

			@Autowired
			private ISettlementRecordService settlementRecordService;

			@Resource
			private IBalanceUsageRecordService balanceUsageRecordService;



			@@ -130,7 +133,7 @@
			// List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
			// datas.addAll(list2);
			//小件物流
			List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
			List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
			datas.addAll(list3);

			//分页
			@@ -170,7 +173,7 @@
			List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(language, state, uid);
			datas.addAll(list2);
			}else{//小件物流
			List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
			List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
			datas.addAll(list3);
			}

			@@ -208,11 +211,11 @@
			List<Map<String, Object>> list1 = orderPrivateCarService.queryMyAllOrder(state, uid, language);
			for (Map<String, Object> map : list1) {
			Integer id = Integer.valueOf(map.get("id").toString());
			map.put("settleAccounts", 1);
			map.put("settleAccounts", 0);
			SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 1));
			if(null != settlementDetail){
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			map.put("settleAccounts", settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
			map.put("settleAccounts", null == settlementRecord \|\| settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
			}
			}
			datas.addAll(list1);
			@@ -223,11 +226,11 @@
			List<Map<String, Object>> list3 = orderLogisticsService.queryMyAllOrder(state, uid, language);
			for (Map<String, Object> map : list3) {
			Integer id = Integer.valueOf(map.get("id").toString());
			map.put("settleAccounts", 1);
			map.put("settleAccounts", 0);
			SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 4));
			if(null != settlementDetail){
			SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
			map.put("settleAccounts", settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
			map.put("settleAccounts", null == settlementRecord \|\| settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
			}
			}
			datas.addAll(list3);
			@@ -524,7 +527,19 @@
			}
			CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
			JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
			map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
			int driverTimeout = jsonObject.getIntValue("driverTimeout");

			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			Integer type = Integer.valueOf(map.get("orderType").toString());
			if(type == 2){
			String travelTime = map.get("travelTime").toString();
			long time = System.currentTimeMillis() - sdf.parse(travelTime).getTime() - (driverTimeout * 60000);
			map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
			}else{
			String estimateArriveTime = map.get("estimateArriveTime").toString();
			long time = System.currentTimeMillis() - sdf.parse(estimateArriveTime).getTime() - (driverTimeout * 60000);
			map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
			}
			return map;
			}

			@@ -732,7 +747,7 @@
			case 3://城际
			return orderCrossCityService.calculateMileage(orderPosition);
			case 4://
			break;
			return orderLogisticsService.calculateMileage(orderPosition.getOrderId(), orderPosition.getLon(), orderPosition.getLat());
			case 5:
			break;
			case 6:
			@@ -1207,14 +1222,18 @@
			}
			if(payType == 3){//余额支付
			driver.setBalance(driver.getBalance() - money);
			if(driver.getLaveBusinessMoney().compareTo(money) < 0){
			double b = money - driver.getLaveBusinessMoney();
			Double laveBusinessMoney = driver.getLaveBusinessMoney();
			if(laveBusinessMoney.compareTo(money) < 0){
			double b = money - laveBusinessMoney;
			driver.setLaveBusinessMoney(0D);
			driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
			driverService.updateById(driver);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 1, b, orderType == 1 ? 1 : 2);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, laveBusinessMoney, orderType == 1 ? 1 : 2);
			}else{
			driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - money);
			driverService.updateById(driver);
			balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, money, orderType == 1 ? 1 : 2);
			}

			if(orderType == 1){//专车