From 92e00dafd06ec748b51f565c7a4c98986a618de9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:01:40 +0800
Subject: [PATCH] 新增加分账功能

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 1698 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 1,631 insertions(+), 67 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index d26afc6..11518dc 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -5,18 +5,25 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.supersavedriving.driver.core.util.ToolUtil;
 import com.supersavedriving.driver.modular.system.dao.OrderMapper;
 import com.supersavedriving.driver.modular.system.model.*;
 import com.supersavedriving.driver.modular.system.service.*;
 import com.supersavedriving.driver.modular.system.util.*;
 import com.supersavedriving.driver.modular.system.util.GaoDe.MapUtil;
-import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
 import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
+import com.supersavedriving.driver.modular.system.warpper.*;
+import com.supersavedriving.driver.core.util.ToolUtil;
+import com.supersavedriving.driver.modular.system.util.GaoDe.model.District;
+import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
+import com.supersavedriving.driver.modular.system.util.PushUtil;
 import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
 import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
 import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
@@ -71,6 +78,41 @@
     @Autowired
     private IYouTuiDriverService youTuiDriverService;
 
+    @Autowired
+    private IWeatherCityService weatherCityService;
+
+    @Autowired
+    private IOrderTransferService orderTransferService;
+
+    @Autowired
+    private ICancelOrderService cancelOrderService;
+
+    @Autowired
+    private IAccountChangeDetailService accountChangeDetailService;
+
+    @Autowired
+    private IRevenueService revenueService;
+
+    @Autowired
+    private ICouponService couponService;
+
+    @Autowired
+    private IUserToCouponService userToCouponService;
+
+    @Autowired
+    private IRechargeRecordService rechargeRecordService;
+
+    @Autowired
+    private IDivisionRecordService divisionRecordService;
+
+    @Autowired
+    private IAgentService agentService;
+
+    @Value("${callbackPath}")
+    private String callbackPath;//支付回调网关地址
+
+    private Map<String, Timer> timerMap = new HashMap<>();
+
 
 
 
@@ -82,12 +124,15 @@
      * @throws Exception
      */
     @Override
-    public Long queryDriverServerOrder(Integer uid) throws Exception {
-        Order order = this.selectOne(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201)));
+    public Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception {
+        Order order = this.selectOne(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1)
+                .in("state", Arrays.asList(102, 103, 104, 105, 106, 401)));
+        Map<String, Object> map = new HashMap<>();
         if(null != order){
-            return order.getId();
+            map.put("id", order.getId());
+            map.put("state", order.getState());
         }
-        return 0L;
+        return map;
     }
 
 
@@ -104,18 +149,18 @@
          * 司机上线且空闲,下单直接给当前司机,其余进大厅
          * 司机下的订单不需要创建新用户,且只能走线下支付
          */
-
         int count = this.selectCount(new EntityWrapper<Order>().eq("userPhone", addOrderWarpper.getPhone()).eq("status", 1).in("state", Arrays.asList(101, 102, 103, 104, 105, 106, 201)));
         if(count > 0){
-            return ResultUtil.error("该用户还有未完成的订单");
+            return ResultUtil.error("该用户还有未完成的订单", "");
         }
         Driver driver = driverService.selectById(uid);
         DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", uid).eq("status", 1));
-        Order order1 = this.selectOne(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201)));
+        Order order1 = this.selectOne(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
         Order order = new Order();
         if(driverWork != null && null == order1){
             order.setDriverId(uid);
             driver.setServerStatus(2);
+            order.setOrderTakingTime(new Date());
         }
         order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
         order.setSource(2);
@@ -138,13 +183,20 @@
         if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
             Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);
             if(null == distance){
-                return ResultUtil.error("获取预估距离出错");
+                return ResultUtil.error("获取预估距离出错", "");
             }
             d = Double.valueOf(distance.get("distance")) / 1000;
             order.setEstimatedMileage(d);
+            order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
         }
-        order = getOrderPrice(1, d, 0, order, "");
-        order.setHallOrder(0);
+        String city = "";
+        District geocode = MapUtil.geocode(order.getStartLng(), order.getStartLat());
+        if(null != geocode){
+            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+                    .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+            city = null != weatherCity ? weatherCity.getId().toString() : "";
+        }
+        order = getOrderPrice(1, d, 0, order, city);
         order.setState(null == order.getDriverId() ? 101 : 102);
         order.setStatus(1);
         order.setCreateTime(new Date());
@@ -155,9 +207,15 @@
             pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
         }else{
             //开始推单
-            pushOrder(order);
+            Order finalOrder = order;
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    pushOrder(finalOrder);
+                }
+            }).start();
         }
-        return ResultUtil.success();
+        return ResultUtil.success(order.getState() == 102 ? order.getId() : null);
     }
 
 
@@ -268,32 +326,46 @@
         }
 
         //恶劣天气
-        boolean badWeather = WeatherUtil.isBadWeather(city);
-        if(badWeather){
-            order.setBadWeatherDistance(num5);//恶劣天气公里
-            order.setBadWeatherPrice(num6);//恶劣天气费
-            if(distance.compareTo(num7) > 0){
-                BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
-                BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
-                order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
-                order.setOverBadWeatherPrice(multiply.doubleValue());//恶劣天气超出公里费
-            }
+        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
+        if(null != systemConfig) {
+            JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+            Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
+            if(1 == num11){
+                boolean badWeather = WeatherUtil.isBadWeather(city);
+                if(badWeather){
+                    order.setBadWeatherDistance(num5);//恶劣天气公里
+                    order.setBadWeatherPrice(num6);//恶劣天气费
+                    if(distance.compareTo(num7) > 0){
+                        BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
+                        BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
+                        order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
+                        order.setOverBadWeatherPrice(multiply.doubleValue());//恶劣天气超出公里费
+                    }
 
-            double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-            if(num9.compareTo(add) < 0){//超出最高金额(重新调整金额)
-                if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
-                    order.setBadWeatherPrice(num9);//恶劣天气费
-                    order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
-                }else{
-                    BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
-                    order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
+                    double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+                    if(num9.compareTo(add) < 0){//超出最高金额(重新调整金额)
+                        if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
+                            order.setBadWeatherPrice(num9);//恶劣天气费
+                            order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
+                        }else{
+                            BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
+                            order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
+                        }
+                    }
                 }
             }
         }
 
+
+        //计算折扣
+        if(null != order.getUserId()){
+
+        }
+
         //计算总金额
         BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
-                order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+
         if(type == 1){//预估价
             order.setEstimatedPrice(bigDecimal.doubleValue());
         }
@@ -328,6 +400,8 @@
         order.setOverBadWeatherPrice(0D);//恶劣天气超出里程费
         order.setDiscountedPrice(0D);//优惠金额
         order.setCouponId(null);//优惠券
+        order.setDiscountAmount(0D);//折扣优惠金额
+        order.setDiscount(0D);//折扣
         return order;
     }
 
@@ -356,7 +430,7 @@
 
         //1
         //找到中心点
-        GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLat), Double.valueOf(startLng));
+        GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
         Double num = num3 / 1000;//范围公里
         //构造半径
         Distance distanceR = new Distance(num, Metrics.KILOMETERS);
@@ -367,8 +441,10 @@
         List<Location> locations = mongoTemplate.find(query, Location.class);
         List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
         Integer driver = null;
+        YouTuiDriver youTuiDriver1 = null;
         if(driverIds.size() > 0){
-            List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds).last(" and now() < failureTime"));
+            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;
             for (YouTuiDriver youTuiDriver : youTuiDrivers) {
                 String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
@@ -380,14 +456,22 @@
                 if(d == null || d.compareTo(wgs84) > 0){
                     d = wgs84;
                     driver = youTuiDriver.getDriverId();
+                    youTuiDriver1 = youTuiDriver;
                 }
             }
         }
 
+        if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+            youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+            youTuiDriverService.updateById(youTuiDriver1);
+        }
 
         //开始范围查找
         if(null == driver){
             for (int i = 1; i < 4; i++) {
+                if(null != driver){
+                    break;
+                }
                 num = jsonObject.getDouble("num" + i) / 1000;//范围公里
                 //构造半径
                 distanceR = new Distance(num, Metrics.KILOMETERS);
@@ -446,7 +530,7 @@
                 @Override
                 public void run() {
                     Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                    if(order1.getState() == 101){
+                    if(order1.getState() == 101 || order1.getState() == 201){
                         order1.setHallOrder(1);
                         OrderServiceImpl.this.updateById(order1);
                     }
@@ -471,11 +555,20 @@
     @Override
     public List<HallOrderList> queryOrderHall(Integer uid, Integer pageNum, Integer pageSize) throws Exception {
         pageNum = (pageNum - 1) * pageSize;
+        String value = redisUtil.getValue("DRIVER" + uid);
         List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
         hallOrderLists.forEach(hallOrderList -> {
-            Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), hallOrderList.getEndLng() + "," + hallOrderList.getEndLat());
-            Double wgs84 = distance.get("WGS84");
-            hallOrderList.setCurrentDistance(wgs84);
+            if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
+                hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+            }
+            hallOrderList.setCurrentDistance(0D);
+            if(ToolUtil.isNotEmpty(value)){
+                Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
+                Double wgs84 = distance.get("WGS84");
+                hallOrderList.setCurrentDistance(wgs84);
+            }else{
+                hallOrderList.setCurrentDistance(0D);
+            }
         });
         return hallOrderLists;
     }
@@ -503,6 +596,30 @@
         orderRefusal.setStartAddress(order.getStartAddress());
         orderRefusal.setOrderId(orderId);
         orderRefusalService.insert(orderRefusal);
+
+        Driver driver = driverService.selectById(uid);
+        //扣除积分
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+        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}
+            //拒绝订单扣除积分
+            Integer num10 = JSON.parseObject(systemConfig.getContent()).getInteger("num10");
+            if (num10 > 0) {
+                AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setUserType(2);
+                accountChangeDetail.setUserId(uid);
+                accountChangeDetail.setType(2);
+                accountChangeDetail.setChangeType(2);
+                accountChangeDetail.setOrderId(orderId);
+                accountChangeDetail.setOldData(null == driver.getIntegral() ? 0 : driver.getIntegral().doubleValue());
+                driver.setIntegral((null == driver.getIntegral() ? 0 : driver.getIntegral()) - num10);
+                accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+                accountChangeDetail.setExplain("拒绝订单扣除积分");
+                accountChangeDetailService.saveData(accountChangeDetail);
+                driverService.updateById(driver);
+            }
+        }
         return ResultUtil.success();
     }
 
@@ -521,25 +638,23 @@
             if(null == driverWork){
                 return ResultUtil.error("请先上班");
             }
-            boolean lock = redisUtil.lock(5);
+            List<Integer> state1 = Arrays.asList(102, 103, 104, 105, 106, 201, 401);
+            int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", uid).eq("status", 1).in("state", state1));
+            if(count > 0){
+                return ResultUtil.error("还有未完成的订单");
+            }
+            boolean lock = redisUtil.lock();
             if(!lock){
-                int num1 = 1;
-                while (num1 <= 10){
-                    Thread.sleep(3000);//等待3秒
-                    lock = redisUtil.lock(5);
-                    if(lock){
-                        break;
-                    }else{
-                        num1++;
-                    }
-                }
+                return ResultUtil.error("请重试");
             }
             Order order = this.selectById(orderId);
-            if(order.getState() != 301){
+            Integer state = order.getState();
+            Integer oldDriverId = order.getDriverId();
+            if(state == 301){
                 redisUtil.unlock();
                 return ResultUtil.error("订单已被取消");
             }
-            if(order.getState() != 101){
+            if(state != 101 && state != 201){
                 redisUtil.unlock();
                 return ResultUtil.error("手速慢了哦");
             }
@@ -547,25 +662,66 @@
             order.setAgentId(driver.getAgentId());
             order.setBranchOfficeId(driver.getBranchOfficeId());
             order.setState(102);
+            order.setOrderTakingTime(new Date());
             this.updateById(order);
             redisUtil.unlock();
 
+            if(null != order.getUserId()){
+                AppUser appUser = appUserService.selectById(order.getUserId());
+                appUser.setCancelCount(0);
+                appUser.setIsException(1);
+                appUserService.updateById(appUser);
+            }
+
             driver.setServerStatus(2);
             driverService.updateById(driver);
+            if(state == 201){//转单的订单
+                //停止定时任务
+                Timer timer = timerMap.get(order.getId().toString());
+                if(null != timer){
+                    timer.cancel();
+                    timerMap.remove(order.getId().toString());
+                }
+                //原司机下班
+                Driver oldDriver = driverService.selectById(oldDriverId);
+                oldDriver.setServerStatus(1);
+                driverService.updateById(oldDriver);
+
+                DriverWork driverWork1 = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", oldDriverId).eq("status", 1));
+                driverWork1.setStatus(2);
+                driverWork1.setOffWorkTime(new Date());
+                driverWorkService.updateById(driverWork1);
+
+                //添加关系数据
+                OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("orderId", order.getId()).eq("status", 1).isNull("successTime"));
+                if(null != orderTransfer){
+                    orderTransfer.setNewDriverId(uid);
+                    orderTransfer.setSuccessTime(new Date());
+                    orderTransferService.updateById(orderTransfer);
+                }else{
+                    orderTransfer = new OrderTransfer();
+                    orderTransfer.setOrderId(order.getId());
+                    orderTransfer.setOldDriverId(oldDriverId);
+                    orderTransfer.setCreateTime(new Date());
+                    orderTransfer.setStatus(1);
+                    orderTransfer.setNewDriverId(uid);
+                    orderTransfer.setSuccessTime(new Date());
+                    orderTransferService.insert(orderTransfer);
+                }
+
+                pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
+                pushUtil.pushTransferSuccessful(oldDriverId, 2, order.getId());
+            }
 
             //推动订单数据
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    //发送系统消息
-                    systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单,请尽快联系客户!");
-                    pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
-                    if(null != order.getUserId()){
-                        systemMessageService.addSystemMessage(order.getUserId(), 1, "接单成功", driver.getName() + "师傅已成功接到您的订单,请保持电话畅通!");
-                        pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
-                    }
-                }
-            }).start();
+            pushOrderInfo(order.getId(), uid);//开始推送订单数据
+            //发送系统消息
+            systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单,请尽快联系客户!");
+            pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
+            if(null != order.getUserId()){
+                systemMessageService.addSystemMessage(order.getUserId(), 1, "接单成功", driver.getName() + "师傅已成功接到您的订单,请保持电话畅通!");
+                pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+            }
         }catch (Exception e){
             redisUtil.unlock();
             e.printStackTrace();
@@ -584,10 +740,1418 @@
     @Override
     public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
         OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+        if(orderInfoWarpper.getTravelTime() == null){
+            orderInfoWarpper.setTravelTime(0);
+        }
+        AppUser appUser = appUserService.selectById(orderInfoWarpper.getUserId());
+        orderInfoWarpper.setBalance(null == appUser ? 0D : appUser.getAccountBalance());
+        orderInfoWarpper.setCurrentDistance(0D);
+        if(ToolUtil.isEmpty(orderInfoWarpper.getAvatar())){
+            orderInfoWarpper.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+        }
         String value = redisUtil.getValue("DRIVER" + uid);
-        Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
-        Double wgs84 = distance.get("WGS84");
-        orderInfoWarpper.setCurrentDistance(wgs84);
+        orderInfoWarpper.setPickUpTime(0);
+        if(ToolUtil.isNotEmpty(value)){
+            Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
+            Double wgs84 = distance.get("WGS84");
+            orderInfoWarpper.setCurrentDistance(null == wgs84 ? 0d : wgs84);
+            Map<String, String> distance1 = MapUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value, 0);
+            orderInfoWarpper.setPickUpTime(Integer.valueOf(distance1.get("duration")) / 60);
+        }
         return orderInfoWarpper;
     }
+
+
+    /**
+     * 司机走订单流程
+     * @param uid
+     * @param processOperationsWarpper
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil driverProcessOperations(Integer uid, ProcessOperationsWarpper processOperationsWarpper) throws Exception {
+        //101=待接单,102=已接单,103=前往预约点,104=到达预约点,105=开始服务,106=到达目的地,107=待支付,108=待评价,109=已完成,201=转单中,301=已取消,401=等待中
+        Order order = this.selectById(processOperationsWarpper.getOrderId());
+        if(order.getState() == processOperationsWarpper.getState()){
+            return ResultUtil.error("不能重复操作");
+        }
+        if(order.getState() == 201){
+            return ResultUtil.error("订单正在转单中");
+        }
+        if(order.getState() == 301){
+            redisUtil.unlock();
+            return ResultUtil.error("订单已被取消");
+        }
+        order.setState(processOperationsWarpper.getState());
+        switch (processOperationsWarpper.getState()){
+            case 103:
+                order.setGoToAppointmentPointTime(new Date());
+                break;
+            case 104:
+                order.setStartWaitTime(new Date());
+                order.setArrivalTimeAtTheAppointmentPoint(new Date());
+                break;
+            case 105:
+                if(null == order.getStartTime()){
+                    redisUtil.addSetValue("serverOrder", order.getId().toString());//存入缓存用于计算实时距离
+                    order.setBoardingTime(new Date());
+                    order.setStartTime(new Date());
+                }
+                //计算等待用户时长
+                Integer w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
+                order.setWaitTime(order.getWaitTime() + w);
+                order.setStartWaitTime(null);
+                break;
+            case 106:
+                order.setGetoffTime(new Date());
+                if(ToolUtil.isEmpty(order.getEndAddress())){
+                    order.setEndAddress(processOperationsWarpper.getEndAddress());
+                    order.setEndLng(processOperationsWarpper.getEndLng());
+                    order.setEndLat(processOperationsWarpper.getEndLat());
+                }
+                //开始计算费用
+                String city = "";
+                District geocode = MapUtil.geocode(order.getEndLng(), order.getEndLat());
+                if(null != geocode){
+                    WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+                            .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+                    city = null != weatherCity ? weatherCity.getId().toString() : "";
+                }
+                order = getOrderPrice(2, Double.valueOf(order.getActualMileage() / 1000), order.getWaitTime(), order, city);
+
+                //修改司机状态和积分
+                Driver driver = driverService.selectById(order.getDriverId());
+                driver.setServerStatus(1);
+                driverService.updateById(driver);
+                saveIntegral(order);
+                break;
+            case 401:
+                order.setStartWaitTime(new Date());
+                break;
+        }
+        this.updateAllColumnById(order);
+
+        //推送订单状态
+        pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
+        if(null != order.getUserId()){
+            pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+        }
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 添加订单积分奖励
+     * @param order
+     * @throws Exception
+     */
+    public void saveIntegral(Order order) throws Exception{
+        Driver driver = driverService.selectById(order.getDriverId());
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+        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}
+            //完成订单奖励
+            Integer num5 = JSON.parseObject(systemConfig.getContent()).getInteger("num5");
+            if(num5 > 0){
+                AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setUserType(2);
+                accountChangeDetail.setUserId(order.getDriverId());
+                accountChangeDetail.setType(2);
+                accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
+                driver.setIntegral(driver.getIntegral() + num5);
+                accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+                accountChangeDetail.setExplain("完成订单奖励");
+                accountChangeDetailService.saveData(accountChangeDetail);
+            }
+            //恶劣天气完成订单奖励
+            Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
+            if(num8 > 0){
+                AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setUserType(2);
+                accountChangeDetail.setUserId(order.getDriverId());
+                accountChangeDetail.setType(2);
+                accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
+                driver.setIntegral(driver.getIntegral() + num8);
+                accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+                accountChangeDetail.setExplain("恶劣天气完成订单奖励");
+                accountChangeDetailService.saveData(accountChangeDetail);
+            }
+            driverService.updateById(driver);
+
+            if(null == order.getUserId()){
+                return;
+            }
+            //推荐用户首单完成奖励
+            Integer num4 = JSON.parseObject(systemConfig.getContent()).getInteger("num4");
+            if(num4 > 0){
+                List<Integer> state = Arrays.asList(105);
+                int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
+                if(count > 1){
+                    return;
+                }
+                AppUser appUser = appUserService.selectById(order.getUserId());
+                if(null != appUser && null != appUser.getInviterType()){
+                    if(appUser.getInviterType() == 1){
+                        return;
+                    }
+                    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(2);
+                    accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+                    driver1.setIntegral(driver1.getIntegral() + num4);
+                    accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+                    accountChangeDetail.setExplain("推荐用户完成首单奖励");
+                    accountChangeDetailService.saveData(accountChangeDetail);
+                    driverService.updateById(driver1);
+                }
+            }
+
+        }
+    }
+
+
+
+    /**
+     * 定时任务推送订单数据
+     * @param orderId
+     * @param uid
+     */
+    public void pushOrderInfo(Long orderId, Integer uid){
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                String value = redisUtil.getValue("DRIVER" + uid);
+                Order order = OrderServiceImpl.this.selectById(orderId);
+                if(order.getState() == 106 || order.getState() == 301){
+                    Timer timer = timerMap.get(order.getId().toString());
+                    if(null != timer){
+                        timer.cancel();
+                        timerMap.remove(order.getId().toString());
+                    }
+                }
+
+                PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+                pushOrderInfoWarpper.setId(orderId);
+                if(ToolUtil.isNotEmpty(value)){
+                    String[] split = value.split(",");
+                    pushOrderInfoWarpper.setDriverLat(split[1]);
+                    pushOrderInfoWarpper.setDriverLng(split[0]);
+                }
+                int w = 0;
+                if(null != order.getStartWaitTime()){
+                    w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
+                }
+                pushOrderInfoWarpper.setWaitTime(order.getWaitTime() + w);
+                pushOrderInfoWarpper.setState(order.getState());
+                pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
+                pushOrderInfoWarpper.setTravelTime(0);
+                if(null != order.getStartTime()){
+                    int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
+                    pushOrderInfoWarpper.setTravelTime(travelTime);
+                }
+                if(null != order.getUserId()){
+                    pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
+                }
+                if(order.getState() == 301){//司机取消不推送给司机
+                    CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
+                    if(null != cancelOrder && cancelOrder.getUserType() == 2){
+                        return;
+                    }
+                }
+                pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
+            }
+        },0, 10000);
+        timerMap.put(orderId.toString(), timer);
+    }
+
+
+    /**
+     * 司机转单操作
+     * @param uid
+     * @param orderId
+     * @param cause
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception {
+        Order order = this.selectById(orderId);
+        if(order.getDriverId().compareTo(uid) != 0){
+            return ResultUtil.error("无权操作");
+        }
+        if(order.getState() > 104){
+            return ResultUtil.error("订单不支持转单");
+        }
+        order.setOldState(order.getState());
+        order.setState(201);
+        this.updateById(order);
+
+        OrderTransfer orderTransfer = new OrderTransfer();
+        orderTransfer.setOrderId(orderId);
+        orderTransfer.setOldDriverId(order.getDriverId());
+        orderTransfer.setCause(cause);
+        orderTransfer.setStatus(1);
+        orderTransfer.setCreateTime(new Date());
+        orderTransferService.insert(orderTransfer);
+
+        //开始派单
+        Order finalOrder = order;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                pushOrder(finalOrder);
+            }
+        }).start();
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 司机修改订单终点
+     * @param uid
+     * @param orderEndAddressWarpper
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil setOrderEndAddress(Integer uid, OrderEndAddressWarpper orderEndAddressWarpper) throws Exception {
+        Order order = this.selectById(orderEndAddressWarpper.getOrderId());
+        order.setEndLat(orderEndAddressWarpper.getEndLat());
+        order.setEndLng(orderEndAddressWarpper.getEndLng());
+        order.setEndAddress(orderEndAddressWarpper.getEndAddress());
+        Map<String, String> distance = MapUtil.getDistance(order.getStartLng() + "," + order.getStartLat(), order.getEndLng() + "," + order.getEndLat(), 1);
+        if(null == distance){
+            return ResultUtil.error("获取预估距离出错");
+        }
+        Double d = Double.valueOf(distance.get("distance")) / 1000;
+        order.setEstimatedMileage(d);
+        order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
+        String city = "";
+        District geocode = MapUtil.geocode(order.getStartLng(), order.getStartLat());
+        if(null != geocode){
+            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+                    .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+            city = null != weatherCity ? weatherCity.getId().toString() : "";
+        }
+        order = getOrderPrice(1, d, 0, order, city);
+        this.updateById(order);
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 司机取消转到操作
+     * @param uid
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil cancelTransferOrder(Integer uid, Long orderId) throws Exception {
+        Order order = this.selectById(orderId);
+        if(order.getState() != 201){
+            return ResultUtil.error("不能取消转单");
+        }
+        order.setState(order.getOldState());
+        order.setOldState(null);
+        this.updateAllColumnById(order);
+
+        OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("orderId", orderId)
+                .eq("status", 1).isNull("successTime").orderBy("createTime desc limit 0, 1"));
+        if(null != orderTransfer){
+            orderTransfer.setStatus(3);
+            orderTransferService.updateById(orderTransfer);
+        }
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 司机取消订单
+     * @param uid
+     * @param orderId
+     * @param cause
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil driverCancelOrder(Integer uid, Long orderId, String cause) throws Exception {
+        Order order = this.selectById(orderId);
+        if(uid.compareTo(order.getDriverId()) != 0){
+            return ResultUtil.error("无法取消订单");
+        }
+        if(order.getState() > 105){
+            return ResultUtil.error("无法取消订单");
+        }
+
+        order.setState(301);
+        this.updateById(order);
+
+        CancelOrder cancelOrder = new CancelOrder();
+        cancelOrder.setOrderId(orderId);
+        cancelOrder.setUserType(2);
+        cancelOrder.setUserId(uid);
+        cancelOrder.setCause(cause);
+        cancelOrder.setStatus(1);
+        cancelOrder.setCreateTime(new Date());
+        cancelOrderService.insert(cancelOrder);
+        Driver driver = driverService.selectById(order.getDriverId());
+        if(null != driver){
+            driver.setServerStatus(1);
+            driverService.updateById(driver);
+        }
+
+        pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 获取订单费用明细
+     * @param uid
+     * @param orderId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
+        Driver driver = driverService.selectById(uid);
+        Order order = this.selectById(orderId);
+        OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
+        BeanUtils.copyProperties(order, orderPriceWarpper);
+        orderPriceWarpper.setWaitTime(orderPriceWarpper.getWaitTime() + orderPriceWarpper.getOutWaitTime());
+        orderPriceWarpper.setWaitTimePrice(orderPriceWarpper.getWaitTimePrice() + orderPriceWarpper.getOutWaitTimePrice());
+        orderPriceWarpper.setLongDistance(0D);
+        if(ToolUtil.isNotEmpty(order.getLongDistance())){
+            String[] split = order.getLongDistance().split("-");
+            Double longDistanc = Double.valueOf(split[1]) - Double.valueOf(split[0]) + orderPriceWarpper.getOverLongDistance();
+            orderPriceWarpper.setLongDistance(longDistanc);
+        }
+        orderPriceWarpper.setLongDistancePrice(orderPriceWarpper.getLongDistancePrice() + orderPriceWarpper.getOverLongDistancePrice());
+        orderPriceWarpper.setBadWeatherDistance(orderPriceWarpper.getBadWeatherDistance() + orderPriceWarpper.getOverBadWeatherDistance());
+        orderPriceWarpper.setBadWeatherPrice(orderPriceWarpper.getBadWeatherPrice() + orderPriceWarpper.getOverBadWeatherPrice());
+
+        orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+        orderPriceWarpper.setTravelTime(0);
+        if(null != order.getGetoffTime()){
+            orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+        }
+        orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
+        orderPriceWarpper.setZfbCollectionCode(driver.getZfbCollectionCode());
+        return orderPriceWarpper;
+    }
+
+
+    /**
+     * 修改订单状态
+     * @param uid
+     * @param orderId
+     * @param state
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception {
+        List<Integer> s = Arrays.asList(107, 108);
+        if(!s.contains(state)){
+            return ResultUtil.error("操作失败");
+        }
+        Order order = this.selectById(orderId);
+        order.setState(state);
+
+        if(payType == 2 && state == 107){
+            order.setPayType(3);
+            Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
+            if(null != coupon){
+                order.setCouponId(coupon.getId());
+                order.setDiscountAmount(coupon.getCouponPreferentialAmount());
+                order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+            }else{
+                order.setPayMoney(order.getOrderMoney());
+            }
+        }
+
+        if(payType == 2 && state == 108){
+            order.setPayTime(new Date());
+            if(null != order.getCouponId()){
+                UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+                if(userToCoupon.getValidCount() > 0){
+                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                    userToCouponService.updateById(userToCoupon);
+                    Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+                    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.getBalance() + driver.getBackgroundBalance() + 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.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                    driverService.updateById(driver);
+                    accountChangeDetailService.insert(accountChangeDetail);
+
+                    //补贴中分账
+                    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(discountedPrice) >= 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;
+                            }
+                        }
+                    }
+
+
+                }
+            }
+
+            if(order.getDiscountAmount() > 0){
+                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.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                accountChangeDetail.setType(1);
+                accountChangeDetail.setChangeType(7);
+                accountChangeDetail.setOrderId(order.getId());
+                accountChangeDetail.setExplain("折扣优惠收入");
+                driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+                accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                driverService.updateById(driver);
+                accountChangeDetailService.insert(accountChangeDetail);
+
+                //补贴中分账
+                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(discountedPrice) >= 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;
+                        }
+                    }
+                }
+            }
+        }
+        this.updateById(order);
+
+        if(payType == 2 && state == 108){//计算抽成
+            saveRevenue(order);
+        }
+
+        PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+        pushOrderInfoWarpper.setId(order.getId());
+        pushOrderInfoWarpper.setState(order.getState());
+        pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+        if(null != order.getUserId()){
+            pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+        }
+        return ResultUtil.success();
+    }
+
+
+
+    /**
+     * 转账
+     * @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)));
+        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 order
+     */
+    public void saveRevenue(Order order) throws Exception{
+        //司机收入和代理商抽成(先分佣,后抽成)
+        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除,剩余的为平台抽佣。
+        Driver driver = driverService.selectById(order.getDriverId());
+        AppUser appUser = appUserService.selectById(order.getUserId());
+        Double payMoney = order.getPayMoney();
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
+        Double n = 0D;
+        if(null != systemConfig){
+            JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+            Double num2 = jsonObject.getDouble("num2");
+            Double num3 = jsonObject.getDouble("num3");
+            n = num3;
+            if(order.getPayMoney() >= 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);
+
+                        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);
+
+                            Double num1_1 = 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_1) >= 0){
+                                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num1_1, callbackPath + "/base/order/zhaunzhangCallback");
+                                    if(zhaunzhang.getCode() == 10000){
+                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                    }
+                                    break;
+                                }else{
+                                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                    if(zhaunzhang.getCode() == 10000){
+                                        rechargeRecord.setSurplusDividedAmount(0d);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                        num1_1 -= surplusDividedAmount;
+                                    }else{
+                                        break;
+                                    }
+                                }
+                            }
+
+                        }
+                        num3 = (num3 >= num1 ? num3 - num1 : 0);
+                    }
+
+                    //开始处理层级抽佣
+                    if(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());//二级司机
+                            if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
+                                Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+                                Double num5 = jsonObject1.getDouble("num5");
+                                Double num6 = jsonObject1.getDouble("num6");
+                                Double num7 = jsonObject1.getDouble("num7");
+                                num5 = (num3 >= num5 ? num5 : num3);
+                                if(num5 > 0){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver1.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num5);
+                                    revenue.setCreateTime(new Date());
+                                    revenueService.insert(revenue);
+
+                                    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() + num5);
+                                    accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+                                    driverService.updateById(driver1);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    Double num5_1 = 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_1) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num5_1, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(0d);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num5_1 -= surplusDividedAmount;
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num5 ? num3 - num5 : 0);
+                                }
+                                num6 = (num3 >= num6 ? num6 : num3);
+                                if(num6 > 0){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver2.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num6);
+                                    revenue.setCreateTime(new Date());
+                                    revenueService.insert(revenue);
+
+                                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setUserType(2);
+                                    accountChangeDetail.setUserId(driver2.getId());
+                                    accountChangeDetail.setType(1);
+                                    accountChangeDetail.setChangeType(5);
+                                    accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + 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());
+                                    driverService.updateById(driver2);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    Double num6_1 = 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_1) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num6_1, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(0d);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num6_1 -= surplusDividedAmount;
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num6 ? num3 - num6 : 0);
+                                }
+                                num7 = (num3 >= num7 ? num7 : num3);
+                                if(num7 > 0){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver3.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num7);
+                                    revenue.setCreateTime(new Date());
+                                    revenueService.insert(revenue);
+
+                                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setUserType(2);
+                                    accountChangeDetail.setUserId(driver3.getId());
+                                    accountChangeDetail.setType(1);
+                                    accountChangeDetail.setChangeType(5);
+                                    accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + 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());
+                                    driverService.updateById(driver3);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    Double num7_1 = 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_1) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), num7_1, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(0d);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num7_1 -= surplusDividedAmount;
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num7 ? num3 - num7 : 0);
+                                }
+                            }else{
+                                Double num3_ = jsonObject1.getDouble("num3");
+                                Double num4 = jsonObject1.getDouble("num4");
+                                num3_ = (num3 >= num3_ ? num3_ : num3);
+                                if(num3_ > 0){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver1.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num3_);
+                                    revenue.setCreateTime(new Date());
+                                    revenueService.insert(revenue);
+
+                                    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() + num3_);
+                                    accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + 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(zhaunzhang.getCode() == 10000){
+                                                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(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(0d);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num3_1 -= surplusDividedAmount;
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+                                }
+                                num4 = (num3 >= num4 ? num4 : num3);
+                                if(num4 > 0){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver2.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num4);
+                                    revenue.setCreateTime(new Date());
+                                    revenueService.insert(revenue);
+
+                                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setUserType(2);
+                                    accountChangeDetail.setUserId(driver2.getId());
+                                    accountChangeDetail.setType(1);
+                                    accountChangeDetail.setChangeType(5);
+                                    accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + 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());
+                                    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(zhaunzhang.getCode() == 10000){
+                                                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(zhaunzhang.getCode() == 10000){
+                                                rechargeRecord.setSurplusDividedAmount(0d);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num4_1 -= surplusDividedAmount;
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num4 ? num3 - num4 : 0);
+                                }
+                            }
+                        }else{
+                            Double num2_ = jsonObject1.getDouble("num2");
+                            num2_ = (num3 >= num2_ ? num2_ : num3);
+                            if(num2_ > 0){
+                                Revenue revenue = new Revenue();
+                                revenue.setType(2);
+                                revenue.setUserType(2);
+                                revenue.setUserId(driver1.getId());
+                                revenue.setOrderId(order.getId());
+                                revenue.setAmount(num2_);
+                                revenue.setCreateTime(new Date());
+                                revenueService.insert(revenue);
+
+                                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() + num2_);
+                                accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + 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(zhaunzhang.getCode() == 10000){
+                                            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(zhaunzhang.getCode() == 10000){
+                                            rechargeRecord.setSurplusDividedAmount(0d);
+                                            rechargeRecordService.updateById(rechargeRecord);
+                                            num2_1 -= surplusDividedAmount;
+                                        }else{
+                                            break;
+                                        }
+                                    }
+                                }
+                                num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+                            }
+                        }
+                    }
+                    //处理代理商抽佣
+                    if(num3 > 0){
+                        Revenue revenue = new Revenue();
+                        revenue.setType(1);
+                        revenue.setUserType(3);
+                        revenue.setUserId(driver.getAgentId());
+                        revenue.setOrderId(order.getId());
+                        revenue.setAmount(num3);
+                        revenue.setCreateTime(new Date());
+                        revenueService.insert(revenue);
+
+                        Agent agent = agentService.selectById(driver.getAgentId());
+                        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) >= 0){
+                                ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3, callbackPath + "/base/order/zhaunzhangCallback");
+                                if(zhaunzhang.getCode() == 10000){
+                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3);
+                                    rechargeRecordService.updateById(rechargeRecord);
+                                }
+                                break;
+                            }else{
+                                ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                if(zhaunzhang.getCode() == 10000){
+                                    rechargeRecord.setSurplusDividedAmount(0d);
+                                    rechargeRecordService.updateById(rechargeRecord);
+                                    num3 -= surplusDividedAmount;
+                                }else{
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        //司机余额扣减抽佣金额
+        if(order.getPayMoney() > payMoney){
+            Double m = order.getPayMoney() - payMoney;
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver.getId());
+            accountChangeDetail.setType(1);
+            accountChangeDetail.setChangeType(9);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+            accountChangeDetail.setExplain("线下收款服务费支出");
+            accountChangeDetail.setCreateTime(new Date());
+            driver.setBalance(driver.getBalance() - m);
+            accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
+
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(m) >= 0){
+                    ResultUtil fengzhang = fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), m, 1);
+                    if(fengzhang.getCode() == 10000){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - m);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    ResultUtil fengzhang = fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
+                    if(fengzhang.getCode() == 10000){
+                        rechargeRecord.setSurplusDividedAmount(0d);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        m -= surplusDividedAmount;
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+
+
+    /**
+     * 分账操作
+     * @param amount
+     */
+    @Override
+    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(amount.toString());
+        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(divisionRecord.getAmount().toString());
+        List<ReceiveUser> splitList = new ArrayList<>();
+        ReceiveUser receiveUser = new ReceiveUser();
+        receiveUser.setSplitUserId(merchantNumber);
+        receiveUser.setRcvSplitAmount(divisionRecord.getAmount().toString());
+        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 driverId
+     * @param state
+     * @param pageNum
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<DriverOrderListWarpper> queryDriverOrderList(Integer driverId, Integer state, Integer pageNum, Integer pageSize) throws Exception {
+        pageNum = (pageNum - 1) * pageSize;
+        return this.baseMapper.queryDriverOrderList(driverId, state, pageNum, pageSize);
+    }
+
+    /**
+     * 司机邀请列表
+     * @param driverId
+     * @param time
+     * @param pageNum
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<InviteListWarpper> queryInviteList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
+        pageNum = (pageNum - 1) * pageSize;
+        return this.baseMapper.queryInviteList(driverId, time, pageNum, pageSize);
+    }
+
+
+    /**
+     * 获取业绩汇总数据
+     * @param driverId
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public PerformanceSummaryWarpper queryPerformanceSummary(Integer driverId, Integer type, String time, Integer dayType) throws Exception {
+        Driver driver = driverService.selectById(driverId);
+        PerformanceSummaryWarpper performanceSummaryWarpper = new PerformanceSummaryWarpper();
+        BeanUtils.copyProperties(driver, performanceSummaryWarpper);
+        Double amount = revenueService.queryTotalAmount(driverId);
+        performanceSummaryWarpper.setGrossIncome(amount);
+        List<Integer> state = Arrays.asList(107, 108, 109);
+        int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", driverId).in("state", state).eq("status", 1));
+        performanceSummaryWarpper.setTotalOrder(count);
+        int position = 0;
+        List<PerformanceRankingWarpper> performanceRankingWarppers = null;
+        if(type == 1){//订单量
+            performanceRankingWarppers = this.baseMapper.queryDriverRank(time, dayType);
+        }
+        if(type == 2){//佣金
+            performanceRankingWarppers = revenueService.queryDriverRank(2, time, dayType);
+        }
+        if(type == 3){//收入
+            performanceRankingWarppers = revenueService.queryDriverRank(1, time, dayType);
+        }
+        for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+            PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+            if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+                position = i + 1;
+                break;
+            }
+        }
+        performanceSummaryWarpper.setPosition(position);
+        performanceSummaryWarpper.setList(performanceRankingWarppers.size() > 10 ? performanceRankingWarppers.subList(0, 10) : performanceRankingWarppers.subList(0, performanceRankingWarppers.size()));
+        return performanceSummaryWarpper;
+    }
+
+
+    /**
+     * 获取我的业绩
+     * @param driverId
+     * @param time
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception {
+        List<MyAchievementWarpper> list = new ArrayList<>();
+//        time = time.replaceAll("-", "年");
+        //订单量
+        List<PerformanceRankingWarpper> performanceRankingWarppers = this.baseMapper.queryDriverRank(time, 2);
+        int position = 0;
+        Double d = 0D;
+        for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+            PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+            Double amountOfData = performanceRankingWarpper.getAmountOfData();
+            if(amountOfData.compareTo(d) != 0){
+                position++;
+                d = amountOfData;
+            }
+            if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+                break;
+            }
+        }
+        MyAchievementWarpper myAchievementWarpper = new MyAchievementWarpper();
+        myAchievementWarpper.setType("订单");
+        myAchievementWarpper.setTime(time);
+        myAchievementWarpper.setRank(position);
+        myAchievementWarpper.setAmountOfData(d);
+        list.add(myAchievementWarpper);
+
+        //收入
+        performanceRankingWarppers = revenueService.queryDriverRank(null, time, 2);
+        position = 0;
+        d = 0D;
+        for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+            PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+            Double amountOfData = performanceRankingWarpper.getAmountOfData();
+            if(amountOfData.compareTo(d) != 0){
+                position++;
+                d = amountOfData;
+            }
+            if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+                break;
+            }
+        }
+        myAchievementWarpper = new MyAchievementWarpper();
+        myAchievementWarpper.setType("收入");
+        myAchievementWarpper.setTime(time);
+        myAchievementWarpper.setRank(position);
+        myAchievementWarpper.setAmountOfData(d);
+        list.add(myAchievementWarpper);
+
+        //佣金
+        performanceRankingWarppers = revenueService.queryDriverRank(2, time, 2);
+        position = 0;
+        d = 0D;
+        for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+            PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+            Double amountOfData = performanceRankingWarpper.getAmountOfData();
+            if(amountOfData.compareTo(d) != 0){
+                position++;
+                d = amountOfData;
+            }
+            if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+                break;
+            }
+        }
+        myAchievementWarpper = new MyAchievementWarpper();
+        myAchievementWarpper.setType("佣金");
+        myAchievementWarpper.setTime(time);
+        myAchievementWarpper.setRank(position);
+        myAchievementWarpper.setAmountOfData(d);
+        list.add(myAchievementWarpper);
+        return list;
+    }
+
+
+    /**
+     * 主动完成线下收款
+     */
+    @Override
+    public void completeCollection() {
+        List<Order> orders = this.selectList(new EntityWrapper<Order>().eq("state", 107).eq("status", 1).eq("payType", 3));
+        for (Order order : orders) {
+            order.setPayTime(new Date());
+            if(null != order.getCouponId()){
+                UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+                if(userToCoupon.getValidCount() > 0){
+                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                    userToCouponService.updateById(userToCoupon);
+                    Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+                    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.getBalance() + driver.getBackgroundBalance() + 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.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                    driverService.updateById(driver);
+                    accountChangeDetailService.insert(accountChangeDetail);
+
+                    //补贴中分账
+                    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(discountedPrice) >= 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;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(order.getDiscountAmount() > 0){
+                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.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                accountChangeDetail.setType(1);
+                accountChangeDetail.setChangeType(7);
+                accountChangeDetail.setOrderId(order.getId());
+                accountChangeDetail.setExplain("折扣优惠收入");
+                driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+                accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                driverService.updateById(driver);
+                accountChangeDetailService.insert(accountChangeDetail);
+
+                //补贴中分账
+                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(discountedPrice) >= 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;
+                        }
+                    }
+                }
+            }
+
+            this.updateById(order);
+
+            try {
+                saveRevenue(order);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

--
Gitblit v1.7.1