java/FHAgentDriving.git

			@@ -15,6 +15,8 @@
			import com.agentdriving.user.modular.system.util.GaoDe.model.District;
			import com.agentdriving.user.modular.system.util.juhe.WeatherUtil;
			import com.agentdriving.user.modular.system.util.mongodb.model.Location;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -42,6 +44,8 @@
			*/
			@Service
			public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {

			Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);

			@Autowired
			private ISystemConfigService systemConfigService;
			@@ -530,12 +534,14 @@
			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());
			logger.warn("范围内司机--》" + JSON.toJSONString(driverIds));
			Integer driver = null;
			YouTuiDriver youTuiDriver1 = null;
			if(driverIds.size() > 0){
			List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
			.eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
			Double d = null;
			logger.warn("优推司机--》" + JSON.toJSONString(youTuiDrivers));
			for (YouTuiDriver youTuiDriver : youTuiDrivers) {
			String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
			if(ToolUtil.isEmpty(value)){
			@@ -551,6 +557,7 @@
			d = wgs84;
			driver = youTuiDriver.getDriverId();
			youTuiDriver1 = youTuiDriver;
			logger.warn("最优优推司机--》" + JSON.toJSONString(driver));
			}
			}
			}
			@@ -575,9 +582,11 @@
			locations = mongoTemplate.find(query, Location.class);

			driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
			logger.warn("范围内司机--》" + JSON.toJSONString(driverIds));
			if(driverIds.size() > 0){
			List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
			.eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
			logger.warn("范围内空闲司机--》" + JSON.toJSONString(drivers));
			if(drivers.size() == 0){
			continue;
			}
			@@ -624,7 +633,7 @@
			}
			}
			}

			logger.warn("最终的司机--》" + JSON.toJSONString(driver));
			if(null != driver){
			pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
			//创建定时任务处理订单到大厅
			@@ -1359,40 +1368,6 @@
			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);

			if(num1 > 0){
			Driver driver1 = driverService.selectById(appUser.getInviterId());
			AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
			accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
			accountChangeDetail.setUserType(2);
			accountChangeDetail.setUserId(driver1.getId());
			accountChangeDetail.setType(1);
			accountChangeDetail.setChangeType(5);
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + 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());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);

			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver1.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num1);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);
			}
			num3 = (num3 >= num1 ? num3 - num1 : 0);
			}

			//开始处理层级抽佣
			if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
			@@ -1401,17 +1376,17 @@
			Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
			if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
			Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
			Double num4 = jsonObject1.getDouble("num4");
			Double num5 = jsonObject1.getDouble("num5");
			Double num6 = jsonObject1.getDouble("num6");
			Double num7 = jsonObject1.getDouble("num7");
			num5 = (num3 >= num5 ? num5 : num3);
			if(num5 > 0 && null != driver1){
			num4 = (num3 >= num4 ? num4 : num3);
			if(num4 > 0 && null != driver1){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver1.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num5);
			revenue.setAmount(num4);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1424,20 +1399,20 @@
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num5);
			driver1.setCommission(driver1.getCommission() + num4);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num5 ? num3 - num5 : 0);
			num3 = (num3 >= num4 ? num3 - num4 : 0);
			}
			num6 = (num3 >= num6 ? num6 : num3);
			if(num6 > 0 && null != driver2){
			num5 = (num3 >= num5 ? num5 : num3);
			if(num5 > 0 && null != driver2){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver2.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num6);
			revenue.setAmount(num5);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1450,20 +1425,20 @@
			accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver2.setCommission(driver2.getCommission() + num6);
			driver2.setCommission(driver2.getCommission() + num5);
			accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			driverService.updateById(driver2);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num6 ? num3 - num6 : 0);
			num3 = (num3 >= num5 ? num3 - num5 : 0);
			}
			num7 = (num3 >= num7 ? num7 : num3);
			if(num7 > 0 && null != driver3){
			num6 = (num3 >= num6 ? num6 : num3);
			if(num6 > 0 && null != driver3){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver3.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num7);
			revenue.setAmount(num6);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1476,23 +1451,23 @@
			accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver3.setCommission(driver3.getCommission() + num7);
			driver3.setCommission(driver3.getCommission() + num6);
			accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
			driverService.updateById(driver3);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num7 ? num3 - num7 : 0);
			num3 = (num3 >= num6 ? num3 - num6 : 0);
			}
			}else{
			Double num2_ = jsonObject1.getDouble("num2");
			Double num3_ = jsonObject1.getDouble("num3");
			Double num4 = jsonObject1.getDouble("num4");
			num3_ = (num3 >= num3_ ? num3_ : num3);
			if(num3_ > 0 && null != driver1){
			num2_ = (num3 >= num2_ ? num2_ : num3);
			if(num2_ > 0 && null != driver1){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver1.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num3_);
			revenue.setAmount(num2_);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1505,20 +1480,20 @@
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num3_);
			driver1.setCommission(driver1.getCommission() + num2_);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num3_ ? num3 - num3_ : 0);
			num3 = (num3 >= num2_ ? num3 - num2_ : 0);
			}
			num4 = (num3 >= num4 ? num4 : num3);
			if(num4 > 0 && null != driver2){
			num3_ = (num3 >= num3_ ? num3_ : num3);
			if(num3_ > 0 && null != driver2){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver2.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num4);
			revenue.setAmount(num3_);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1531,23 +1506,23 @@
			accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver2.setCommission(driver2.getCommission() + num4);
			driver2.setCommission(driver2.getCommission() + num3_);
			accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
			driverService.updateById(driver2);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num4 ? num3 - num4 : 0);
			num3 = (num3 >= num3_ ? num3 - num3_ : 0);
			}
			}
			}else{
			Double num2_ = jsonObject1.getDouble("num2");
			num2_ = (num3 >= num2_ ? num2_ : num3);
			if(num2_ > 0 && null != driver1){
			Double num1_ = jsonObject1.getDouble("num1");
			num1_ = (num3 >= num1_ ? num1_ : num3);
			if(num1_ > 0 && null != driver1){
			Revenue revenue = new Revenue();
			revenue.setType(2);
			revenue.setUserType(2);
			revenue.setUserId(driver1.getId());
			revenue.setOrderId(order.getId());
			revenue.setAmount(num2_);
			revenue.setAmount(num1_);
			revenue.setCreateTime(new Date());
			revenueService.insert(revenue);

			@@ -1560,11 +1535,11 @@
			accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			accountChangeDetail.setExplain("订单分佣收入");
			accountChangeDetail.setCreateTime(new Date());
			driver1.setCommission(driver1.getCommission() + num2_);
			driver1.setCommission(driver1.getCommission() + num1_);
			accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
			driverService.updateById(driver1);
			accountChangeDetailService.saveData(accountChangeDetail);
			num3 = (num3 >= num2_ ? num3 - num2_ : 0);
			num3 = (num3 >= num1_ ? num3 - num1_ : 0);
			}
			}
			}