java/SuperSaveDriving.git

			@@ -170,6 +170,19 @@
			if(null != appUser){
			order.setUserId(appUser.getId());
			}


			String startAddress = addOrderWarpper.getStartAddress();
			startAddress = startAddress.replaceAll("& #40;", "(");
			startAddress = startAddress.replaceAll("& #41;", ")");
			addOrderWarpper.setStartAddress(startAddress);
			if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
			String endAddress = addOrderWarpper.getEndAddress();
			endAddress = endAddress.replaceAll("& #40;", "(");
			endAddress = endAddress.replaceAll("& #41;", ")");
			addOrderWarpper.setEndAddress(endAddress);
			}

			order.setUserName(addOrderWarpper.getUserName());
			order.setUserPhone(addOrderWarpper.getPhone());
			order.setAgentId(driver.getAgentId());
			@@ -684,6 +697,7 @@
			pageNum = (pageNum - 1) * pageSize;
			String value = redisUtil.getValue("DRIVER" + uid);
			List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
			List<HallOrderList> lists = new ArrayList<>();
			hallOrderLists.forEach(hallOrderList -> {
			if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
			hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
			@@ -693,11 +707,17 @@
			Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
			Double wgs84 = distance.get("WGS84");
			hallOrderList.setCurrentDistance(wgs84);

			if(wgs84 > 5000){
			return;
			}
			}else{
			hallOrderList.setCurrentDistance(0D);
			return;
			}
			lists.add(hallOrderList);
			});
			return hallOrderLists;
			return lists;
			}


			@@ -1403,15 +1423,14 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Order order1 = OrderServiceImpl.this.selectById(orderId);
			if(order1.getState() == 107){
			completeCollection_(order1);
			try {
			OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}, 60000);
			}


			return ResultUtil.success();
			}