From e0faebd41278c2e9389a26f39b2bfff63d68103d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 23:36:08 +0800
Subject: [PATCH] 更新部分代码

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 1392 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 1,269 insertions(+), 123 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 13c646f..5e7ddfb 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -12,11 +12,15 @@
 import com.supersavedriving.user.modular.system.util.*;
 import com.supersavedriving.user.modular.system.util.GaoDe.MapUtil;
 import com.supersavedriving.user.modular.system.util.GaoDe.model.District;
+import com.supersavedriving.user.modular.system.util.MallBook.model.*;
+import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
+import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
 import com.supersavedriving.user.modular.system.util.juhe.WeatherUtil;
 import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
 import com.supersavedriving.user.modular.system.warpper.*;
 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;
@@ -29,6 +33,7 @@
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
+import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -87,6 +92,27 @@
     @Autowired
     private IEvaluateService evaluateService;
 
+    @Autowired
+    private IRevenueService revenueService;
+
+    @Autowired
+    private IAgentService agentService;
+
+    @Autowired
+    private IPlatformRechargeRecordService platformRechargeRecordService;
+
+    @Autowired
+    private IDivisionRecordService divisionRecordService;
+
+    @Autowired
+    private IRechargeRecordService rechargeRecordService;
+
+    @Value("${wx.appletsAppid}")
+    private String appletsAppid;
+
+    @Value("${callbackPath}")
+    private String callbackPath;//支付回调网关地址
+
 
 
 
@@ -115,7 +141,8 @@
         String city = "";
         District geocode = MapUtil.geocode(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString());
         if(null != geocode){
-            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>().where(" '" + geocode.getDistrict() + "' like district"));
+            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 order = getOrderPrice(1, d, 0, new Order(), city);
@@ -145,7 +172,7 @@
             }
             if(nearbyDriverWarppers.size() > 0){
                 NearbyDriverWarpper nearbyDriverWarpper = nearbyDriverWarppers.get(0);
-                Map<String, String> distance = MapUtil.getDistance(nearbyDriverWarpper.getLonLat(), estimatedCosts.getLng() + "," + estimatedCosts.getLat(), 1);
+                Map<String, String> distance = MapUtil.getDistance(nearbyDriverWarpper.getLonLat(), estimatedCosts.getStartLng() + "," + estimatedCosts.getStartLat(), 1);
                 if(null != distance){
                     distance.get("distance");//距离(M)
                     String duration = distance.get("duration");//时间(S)
@@ -267,28 +294,36 @@
         }
 
         //恶劣天气
-        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());//恶劣天气超出公里费
+                        }
+                    }
                 }
             }
         }
+
 
         //计算总金额
         BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
@@ -354,6 +389,18 @@
         if(null != order){
             return ResultUtil.error("您还有正在进行的订单");
         }
+
+        String startAddress = travelOrder.getStartAddress();
+        startAddress = startAddress.replaceAll("& #40;", "(");
+        startAddress = startAddress.replaceAll("& #41;", ")");
+        travelOrder.setStartAddress(startAddress);
+        if(ToolUtil.isNotEmpty(travelOrder.getEndAddress())){
+            String endAddress = travelOrder.getEndAddress();
+            endAddress = endAddress.replaceAll("& #40;", "(");
+            endAddress = endAddress.replaceAll("& #41;", ")");
+            travelOrder.setEndAddress(endAddress);
+        }
+
         order = new Order();
         BeanUtils.copyProperties(travelOrder, order);
         if(ToolUtil.isEmpty(travelOrder.getUserPhone())){
@@ -361,7 +408,6 @@
             order.setUserName(appUser.getNickname());
         }
         order.setUserId(uid);
-        order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
         order.setSource(1);
         order.setHallOrder(0);
         order.setStatus(1);
@@ -375,11 +421,13 @@
             }
             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.getDistrict() + "' like district"));
+            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);
@@ -389,6 +437,9 @@
                 return ResultUtil.error("司机还未上班");
             }
             Driver driver = driverService.selectById(travelOrder.getDriverId());
+            if(driver.getServerStatus() == 2){
+                return ResultUtil.error("司机正在服务中");
+            }
             order.setAgentId(driver.getAgentId());
             order.setBranchOfficeId(driver.getBranchOfficeId());
             order.setOrderTakingTime(new Date());
@@ -397,20 +448,26 @@
             driverService.updateById(driver);
 
             appUser.setCancelCount(0);
+            appUser.setIsException(1);
             appUserService.updateById(appUser);
         }
 
         for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {
             order.setId(null);
-            this.insert(order);
-
-            //推送状态
-            pushUtil.pushOrderStatus(uid, 1, order.getId(), order.getState());
-            if(null != travelOrder.getDriverId()){
-                pushUtil.pushOrderStatus(travelOrder.getDriverId(), 2, order.getId(), order.getState());
-            }else{
-                //推单
-                pushOrder(order);
+            order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+            boolean insert = this.insert(order);
+            if(insert){
+                //推送状态
+                pushUtil.pushOrderStatus(uid, 1, order.getId(), order.getState());
+                if(null != order.getDriverId()){
+                    PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+                    pushOrderInfoWarpper.setId(order.getId());
+                    pushOrderInfoWarpper.setState(order.getState());
+                    pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+                }else{
+                    //推单
+                    pushOrder(order.getId());
+                }
             }
         }
         return ResultUtil.success(order.getId());
@@ -421,9 +478,9 @@
 
     /**
      * 订单推送逻辑
-     * @param order
      */
-    public void pushOrder(Order order){
+    public void pushOrder(Long orderId){
+        Order order = this.selectById(orderId);
         /**
          * 1.先找最大推单范围内的优推司机 -》 距离最近
          * 没有1 - 》
@@ -443,7 +500,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);
@@ -454,12 +511,18 @@
         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());
                 if(ToolUtil.isEmpty(value)){
+                    continue;
+                }
+                Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
+                if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
                     continue;
                 }
                 Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
@@ -467,14 +530,21 @@
                 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);
@@ -486,36 +556,45 @@
 
                 driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
                 if(driverIds.size() > 0){
-                    List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1).in("id", driverIds));
+                    List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+                            .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
                     if(drivers.size() == 0){
                         continue;
                     }
 
-                    Integer integral = null;
-                    Double score = null;
+                    Integer integral = null;//积分
+                    Double score = null;//评分
                     Double d = null;
                     for (Driver driver1 : drivers) {
+                        String value = redisUtil.getValue("DRIVER" + driver1.getId());
+                        if(ToolUtil.isEmpty(value)){
+                            continue;
+                        }
                         if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
                             integral = driver1.getIntegral();
                             score = driver1.getScore();
                             driver = driver1.getId();
+                            Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+                            Double wgs84 = distance.get("WGS84");
+                            d = wgs84;
                             continue;
                         }
                         if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
                             integral = driver1.getIntegral();
                             score = driver1.getScore();
                             driver = driver1.getId();
+                            Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+                            Double wgs84 = distance.get("WGS84");
+                            d = wgs84;
                             continue;
                         }
                         if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
-                            String value = redisUtil.getValue("DRIVER" + driver1.getId());
-                            if(ToolUtil.isEmpty(value)){
-                                continue;
-                            }
                             Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
                             Double wgs84 = distance.get("WGS84");
-                            if(d == null || d.compareTo(wgs84) > 0){
+                            if(d.compareTo(wgs84) > 0){
                                 d = wgs84;
+                                integral = driver1.getIntegral();
+                                score = driver1.getScore();
                                 driver = driver1.getId();
                                 continue;
                             }
@@ -568,9 +647,27 @@
         cancelOrder.setStatus(1);
         cancelOrder.setCreateTime(new Date());
         cancelOrderService.insert(cancelOrder);
+        order.setState(301);
+        this.updateById(order);
         AppUser appUser = appUserService.selectById(uid);
         appUser.setCancelCount(appUser.getCancelCount() + 1);
+        if(appUser.getCancelCount() >= 3){
+            appUser.setIsException(2);
+        }
         appUserService.updateById(appUser);
+        Driver driver = driverService.selectById(order.getDriverId());
+        if(null != driver){
+            driver.setServerStatus(1);
+            driverService.updateById(driver);
+        }
+
+        pushUtil.pushOrderStatus(uid, 1, orderId, order.getState());
+        if(null != order.getDriverId()){
+            PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+            pushOrderInfoWarpper.setId(order.getId());
+            pushOrderInfoWarpper.setState(order.getState());
+            pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+        }
         return ResultUtil.success();
     }
 
@@ -584,7 +681,19 @@
      */
     @Override
     public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
-        return this.baseMapper.queryOrderInfo(uid, orderId);
+        OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(uid, orderId);
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 7));
+        if(null != systemConfig){
+            JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+            orderInfoWarpper.setServiceCell(jsonObject.getString("num1"));
+        }
+        String value = redisUtil.getValue("DRIVER" + orderInfoWarpper.getDriverId());
+        if(ToolUtil.isNotEmpty(value)){
+            String[] split = value.split(",");
+            orderInfoWarpper.setDriverLon(split[0]);
+            orderInfoWarpper.setDriverLat(split[1]);
+        }
+        return orderInfoWarpper;
     }
 
 
@@ -610,11 +719,13 @@
             }
             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().toString(), order.getStartLat().toString());
         if(null != geocode){
-            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>().where(" '" + geocode.getDistrict() + "' like district"));
+            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 order1 = new Order();
@@ -622,6 +733,14 @@
         Order orderPrice = getOrderPrice(1, d, 0, order1, city);
         order.setEstimatedPrice(orderPrice.getEstimatedPrice());
         this.updateById(order);
+
+        PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+        pushOrderInfoWarpper.setId(order.getId());
+        pushOrderInfoWarpper.setState(order.getState());
+        pushOrderInfoWarpper.setEndAddress(order.getEndAddress());
+        pushOrderInfoWarpper.setEndLat(order.getEndLat());
+        pushOrderInfoWarpper.setEndLng(order.getEndLng());
+        pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
         return ResultUtil.success();
     }
 
@@ -633,40 +752,69 @@
      * @throws Exception
      */
     @Override
-    public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId, Integer payType) throws Exception {
+    public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
+        Order order = this.selectById(orderId);
+        OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
+        BeanUtils.copyProperties(order, orderPriceWarpper);
+        orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+        orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+        return orderPriceWarpper;
+    }
+
+
+    /**
+     * 重新计算费用明细
+     * @param orderId
+     * @param couponId
+     * @param payType
+     * @param balance
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public OrderPriceWarpper calculationOfExpenses(Integer uid, Long orderId, Integer couponId, Integer payType, Double balance) throws Exception {
         Order order = this.selectById(orderId);
         OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
         BeanUtils.copyProperties(order, orderPriceWarpper);
         AppUser appUser = appUserService.selectById(uid);
+        orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+        orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
         orderPriceWarpper.setBalance(appUser.getAccountBalance());
+        orderPriceWarpper.setDiscount(0D);
+        orderPriceWarpper.setDiscountAmount(0D);
+        orderPriceWarpper.setPayType(1);//微信支付
         Double orderMoney = order.getOrderMoney();
         //先算优惠券
-        Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
-        if(null != coupon){
-            orderMoney = orderMoney - coupon.getCouponPreferentialAmount();
+//        Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
+//        if(null != coupon && null == couponId){
+//            orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+//            orderPriceWarpper.setCouponId(coupon.getId());
+//        }
+        if(payType == 1 && null == couponId && appUser.getHavDiscount() == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣
+            orderPriceWarpper.setDiscount(9D);
+            orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+            orderMoney = new BigDecimal(orderMoney * 0.9).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
         }
-        //再算折扣(余额完全可以抵扣费用才能有折扣)
-        if(payType == 1 && appUser.getAccountBalance() > orderMoney){//使用余额抵扣
-            orderPriceWarpper.setDiscount(appUser.getHavDiscount() == 0 ? 0 : 9D);
-            orderPriceWarpper.setDiscountAmount(orderMoney * 0.1);
-            orderPriceWarpper.setPayType(2);//余额支付
-            orderMoney = orderMoney - orderPriceWarpper.getDiscountAmount();
+        if(null != couponId){
+            UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
+            Coupon coupon1 = couponService.selectById(userToCoupon.getCouponId());
+            orderMoney = orderMoney - coupon1.getCouponPreferentialAmount();
+            orderPriceWarpper.setDiscountedPrice(coupon1.getCouponPreferentialAmount());
+            orderPriceWarpper.setCouponId(couponId);
         }
         if(payType == 0){//不使用余额抵扣
-            orderPriceWarpper.setDiscount(0D);
-            orderPriceWarpper.setDiscountAmount(0D);
-            orderPriceWarpper.setPayType(1);//微信支付
+            orderPriceWarpper.setPayType(1);
         }
-        if(payType == 1 && appUser.getAccountBalance() > 0 && appUser.getAccountBalance() < orderMoney){//使用余额抵扣部分
-            orderPriceWarpper.setDiscount(0D);
-            orderPriceWarpper.setDiscountAmount(0D);
-            orderPriceWarpper.setPayType(4);//微信+余额
-            orderMoney = orderMoney - appUser.getAccountBalance();
+        if(payType == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣
+            orderPriceWarpper.setPayType(2);
         }
+        if(payType == 1 && balance.compareTo(orderMoney) < 0){//使用余额抵扣部分
+            orderPriceWarpper.setPayType(4);
+        }
+
         orderPriceWarpper.setPayMoney(orderMoney);
         return orderPriceWarpper;
     }
-
 
     /**
      * 获取订单支付页面优惠券列表
@@ -732,19 +880,103 @@
             UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
             if(userToCoupon.getValidCount() > 0){
                 userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                userToCouponService.updateById(userToCoupon);
                 Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
                 payMoney = payMoney - coupon.getCouponPreferentialAmount();
                 order.setCouponId(coupon.getId());
                 order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+                userToCouponService.updateById(userToCoupon);
             }
         }
         order.setPayType(1);
         order.setPayMoney(payMoney);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         String out_trade_no = sdf.format(new Date()) + order.getId();
-        ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
+
+        PaymentOrder paymentOrder = new PaymentOrder();
+        paymentOrder.setBizOrderId(out_trade_no);
+        paymentOrder.setAmount(String.valueOf(payMoney * 100));
+        paymentOrder.setOrderName("代驾服务费");
+        paymentOrder.setPayType("WX_MINI");
+        paymentOrder.setTransferType("0");
+        paymentOrder.setAsynSplitFlag("1");
+        paymentOrder.setAppid(appletsAppid);
+        paymentOrder.setOpenid(appUser.getOpenid());
+        paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
+        List<PaymentOrderGood> goodsDetail = new ArrayList<>();
+        PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
+        paymentOrderGood.setGoodsName("服务费");
+        goodsDetail.add(paymentOrderGood);
+        paymentOrder.setGoodsDetail(goodsDetail);
+        paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
+        paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
+        paymentOrder.setParameter1(order.getId().toString());
+
+        TrhRequest<PaymentOrder> request = new TrhRequest();
+        InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
+        if(!"0000".equals(execute.getCode())){
+            return ResultUtil.error(execute.getMsg());
+        }
+        JSONObject jsonObject = JSON.parseObject(execute.getResult());
+        String status = jsonObject.getString("status");
+        if("2".equals(status)){
+            return ResultUtil.error("失败");
+        }
+        if("0".equals(status)){
+            return ResultUtil.error("处理中");
+        }
+        String merOrderId = jsonObject.getString("merOrderId");
+        String payCode = jsonObject.getString("payCode");
         this.updateById(order);
-        return weixinpay;
+
+        if(ToolUtil.isNotEmpty(payCode)){
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        int num = 1;
+                        int wait = 0;
+                        while (num <= 10){
+                            int min = 5000;
+                            wait += (min * num);
+                            Order order1 = OrderServiceImpl.this.selectById(order.getId());
+                            if(order1.getState() != 107){
+                                return;
+                            }
+                            QueryOrder queryOrder = new QueryOrder();
+                            queryOrder.setOriginalMerOrderId(merOrderId);
+                            queryOrder.setQueryType("1");
+                            TrhRequest<QueryOrder> request = new TrhRequest();
+                            InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+                            if("0000".equals(execute1.getCode())){
+                                JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+                                String status1 = jsonObject1.getString("status");
+                                if("0".equals(status1)){//待处理
+                                    Thread.sleep(wait);
+                                    num++;
+                                }
+                                if("1".equals(status1)){//成功
+                                    String merOrderId = jsonObject1.getString("merOrderId");
+                                    ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
+
+                                    break;
+                                }
+                                if("2".equals(status1) || 10 == num){//失败
+                                    break;
+                                }
+                            }else{
+                                Thread.sleep(wait);
+                                num++;
+                            }
+                        }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+
+        return ResultUtil.success(payCode);
     }
 
 
@@ -754,23 +986,40 @@
      * @param appUser
      * @return
      */
-    public ResultUtil balancePayment(Order order, AppUser appUser, Integer couponId){
+    public ResultUtil balancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
         Double payMoney = order.getOrderMoney();
         if(null != couponId){
             UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
             if(userToCoupon.getValidCount() > 0){
                 userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                userToCouponService.updateById(userToCoupon);
                 Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
                 payMoney = payMoney - coupon.getCouponPreferentialAmount();
                 order.setCouponId(coupon.getId());
                 order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+
+                Driver driver = driverService.selectById(order.getDriverId());
+                AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setUserType(2);
+                accountChangeDetail.setUserId(order.getDriverId());
+                accountChangeDetail.setCreateTime(new Date());
+                accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                accountChangeDetail.setType(1);
+                accountChangeDetail.setChangeType(7);
+                accountChangeDetail.setOrderId(order.getId());
+                accountChangeDetail.setExplain("优惠券收入");
+                driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
+                accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+                driverService.updateById(driver);
+                accountChangeDetailService.insert(accountChangeDetail);
             }
         }
 
         if(appUser.getHavDiscount() == 1){//9折
-            payMoney = payMoney * 0.9;
             order.setDiscount(9D);
             order.setDiscountAmount(payMoney * 0.1);
+            payMoney = payMoney * 0.9;
         }
 
         order.setPayType(2);
@@ -779,17 +1028,32 @@
         order.setState(108);
         this.updateById(order);
 
+        pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+        if(null != order.getDriverId()) {
+            PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+            pushOrderInfoWarpper.setId(order.getId());
+            pushOrderInfoWarpper.setState(order.getState());
+            pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+        }
+
+
         AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
         accountChangeDetail.setUserType(1);
         accountChangeDetail.setUserId(appUser.getId());
         accountChangeDetail.setCreateTime(new Date());
         accountChangeDetail.setOldData(appUser.getAccountBalance());
         accountChangeDetail.setType(1);
+        accountChangeDetail.setChangeType(2);
+        accountChangeDetail.setOrderId(order.getId());
         accountChangeDetail.setExplain("代驾服务费");
         appUser.setAccountBalance(appUser.getAccountBalance() - payMoney);
         accountChangeDetail.setNewData(appUser.getAccountBalance());
         appUserService.updateById(appUser);
         accountChangeDetailService.insert(accountChangeDetail);
+
+        //处理佣金和收入记录
+        saveCommission(order);
         return ResultUtil.success();
     }
 
@@ -808,6 +1072,7 @@
             UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
             if(userToCoupon.getValidCount() > 0){
                 userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                userToCouponService.updateById(userToCoupon);
                 Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
                 payMoney = payMoney - coupon.getCouponPreferentialAmount();
                 order.setCouponId(coupon.getId());
@@ -820,11 +1085,14 @@
         payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
 
         AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
         accountChangeDetail.setUserType(1);
         accountChangeDetail.setUserId(appUser.getId());
         accountChangeDetail.setCreateTime(new Date());
         accountChangeDetail.setOldData(appUser.getAccountBalance());
         accountChangeDetail.setType(1);
+        accountChangeDetail.setChangeType(2);
+        accountChangeDetail.setOrderId(order.getId());
         accountChangeDetail.setExplain("代驾服务费");
         appUser.setAccountBalance(appUser.getAccountBalance() > payMoney ? appUser.getAccountBalance() - payMoney : 0);
         accountChangeDetail.setNewData(appUser.getAccountBalance());
@@ -834,75 +1102,108 @@
         if(0 < payMoney){//还需要调起微信支付
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             String out_trade_no = sdf.format(new Date()) + order.getId();
-            ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
 
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        int num = 1;
-                        int wait = 0;
-                        while (num <= 10){
-                            int min = 5000;
-                            wait += (min * num);
-                            Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                            if(order1.getState() != 107){
-                                return;
-                            }
+            PaymentOrder paymentOrder = new PaymentOrder();
+            paymentOrder.setBizOrderId(out_trade_no);
+            paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
+            paymentOrder.setOrderName("代驾服务费");
+            paymentOrder.setPayType("WX_MINI");
+            paymentOrder.setTransferType("0");
+            paymentOrder.setAsynSplitFlag("1");
+            paymentOrder.setAppid("");
+            paymentOrder.setOpenid(appUser.getOpenid());
+            paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
+            List<PaymentOrderGood> goodsDetail = new ArrayList<>();
+            PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
+            paymentOrderGood.setGoodsName("服务费");
+            goodsDetail.add(paymentOrderGood);
+            paymentOrder.setGoodsDetail(goodsDetail);
+            paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
+            paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
+            paymentOrder.setParameter1(order.getId().toString());
+            paymentOrder.setParameter2(payMoney.toString());
 
-                            /**
-                             * SUCCESS--支付成功
-                             * REFUND--转入退款
-                             * NOTPAY--未支付
-                             * CLOSED--已关闭
-                             * REVOKED--已撤销(刷卡支付)
-                             * USERPAYING--用户支付中
-                             * PAYERROR--支付失败(其他原因,如银行返回失败)
-                             * ACCEPT--已接收,等待扣款
-                             */
-                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
-                            if(resultUtil.getCode() == 200){
-                                Map<String, String> map = resultUtil.getData();
-                                String trade_type = map.get("trade_type");
-                                String trade_state = map.get("trade_state");
-                                String transaction_id = map.get("transaction_id");
-                                if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
-                                    AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-                                    AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-                                    Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-                                    appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-                                    appUserService.updateById(appUser1);
+            TrhRequest<PaymentOrder> request = new TrhRequest();
+            InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
+            if(!"0000".equals(execute.getCode())){
+                return ResultUtil.error(execute.getMsg());
+            }
+            JSONObject jsonObject = JSON.parseObject(execute.getResult());
+            String status = jsonObject.getString("status");
+            if("2".equals(status)){
+                return ResultUtil.error("失败");
+            }
+            if("0".equals(status)){
+                return ResultUtil.error("处理中");
+            }
+            String merOrderId = jsonObject.getString("merOrderId");
+            String payCode = jsonObject.getString("payCode");
+            this.updateById(order);
 
-                                    accountChangeDetailService.deleteById(accountChangeDetail.getId());
+            if(ToolUtil.isNotEmpty(payCode)){
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            int num = 1;
+                            int wait = 0;
+                            while (num <= 10){
+                                int min = 5000;
+                                wait += (min * num);
+                                Order order1 = OrderServiceImpl.this.selectById(order.getId());
+                                if(order1.getState() != 107){
                                     return;
                                 }
-                                if("SUCCESS".equals(trade_state)){
-                                    order1.setPayTime(new Date());
-                                    order1.setState(108);
-                                    order1.setOrderNo(transaction_id);
-                                    OrderServiceImpl.this.updateById(order1);
+                                QueryOrder queryOrder = new QueryOrder();
+                                queryOrder.setOriginalMerOrderId(merOrderId);
+                                queryOrder.setQueryType("1");
+                                TrhRequest<QueryOrder> request = new TrhRequest();
+                                InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+                                if("0000".equals(execute1.getCode())){
+                                    JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+                                    String status1 = jsonObject1.getString("status");
+                                    if("0".equals(status1)){//待处理
+                                        Thread.sleep(wait);
+                                        num++;
+                                    }
+                                    if("1".equals(status1)){//成功
+                                        String merOrderId = jsonObject1.getString("merOrderId");
+                                        ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
 
-                                    //处理抽成及收入
-                                    return;
-                                }
-                                if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
+                                        break;
+                                    }
+                                    if("2".equals(status1) || 10 == num){//失败
+                                        Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
+                                        AppUser appUser1 = appUserService.selectById(order1.getUserId());
+                                        appUser1.setAccountBalance(appUser1.getAccountBalance() + m);
+                                        appUserService.updateById(appUser1)
+                                        accountChangeDetailService.deleteById(accountChangeDetail.getId());
+                                        break;
+                                    }
+                                }else{
                                     Thread.sleep(wait);
                                     num++;
                                 }
                             }
+                        }catch (Exception e){
+                            e.printStackTrace();
                         }
-                    }catch (Exception e){
-                        e.printStackTrace();
                     }
-                }
-            }).start();
-            return weixinpay;
+                }).start();
+            }
+
+
+
+            return ResultUtil.success(payCode);
+
+
         }
-        order.setPayTime(new Date());
-        this.updateById(order);
+//        order.setPayTime(new Date());
+//        this.updateById(order);
 
 
         return ResultUtil.success();
+
     }
 
     /**
@@ -922,9 +1223,24 @@
         order.setOrderNo(transaction_id);
         this.updateById(order);
         //添加收入明细
+        saveCommission(order);
 
+        pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+        if(null != order.getDriverId()) {
+            PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+            pushOrderInfoWarpper.setId(order.getId());
+            pushOrderInfoWarpper.setState(order.getState());
+            pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+        }
         return ResultUtil.success();
     }
+
+
+
+
+
+
+
 
 
     /**
@@ -953,7 +1269,7 @@
         evaluate.setUserId(uid);
         evaluateService.insert(evaluate);
         Driver driver = driverService.selectById(order.getDriverId());
-        driver.setScore((driver.getScore() + score) / 2);
+        driver.setScore(((null == driver.getScore() ? 0 : driver.getScore()) + score) / 2);
         if(score == 5){//司机积分奖励
             SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
             if(null != systemConfig){
@@ -963,6 +1279,7 @@
 
                 //增加积分变动记录
                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
                 accountChangeDetail.setUserType(2);
                 accountChangeDetail.setUserId(order.getDriverId());
                 accountChangeDetail.setCreateTime(new Date());
@@ -974,7 +1291,836 @@
                 accountChangeDetailService.insert(accountChangeDetail);
             }
         }
+        if(score < 3){//差评扣减积分
+            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}
+                JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+                Integer num9 = jsonObject.getInteger("num9");
+
+                //增加积分变动记录
+                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.getIntegral().doubleValue());
+                accountChangeDetail.setType(2);
+                accountChangeDetail.setExplain("差评扣减积分");
+                driver.setIntegral(driver.getIntegral() - num9);
+                accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+                accountChangeDetailService.insert(accountChangeDetail);
+            }
+        }
         driverService.updateById(driver);
         return ResultUtil.success();
     }
+
+
+    /**
+     * 处理订单收入及分佣抽成
+     * @param order
+     * @return
+     * @throws Exception
+     */
+    public void saveCommission(Order order) throws Exception{
+        //司机收入和代理商抽成(先分佣,后抽成)
+        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除,剩余的为平台抽佣。
+        Driver driver = driverService.selectById(order.getDriverId());
+        AppUser appUser = appUserService.selectById(order.getUserId());
+        Double payMoney = order.getPayMoney();//todo 司机订单收入归并到佣金中一起提现
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
+        if(null != systemConfig){
+            JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+            Double num2 = jsonObject.getDouble("num2");
+            Double num3 = jsonObject.getDouble("num3");
+            if(order.getPayMoney() >= num2){
+                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_ = num1;
+                            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                if(surplusDividedAmount.compareTo(num1_) >= 0){
+                                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num1_, callbackPath + "/base/order/zhaunzhangCallback");
+                                    if(10000 == zhaunzhang.getCode()){
+                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                    }
+                                    break;
+                                }else{
+                                    num1_ -= surplusDividedAmount;
+                                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                    if(10000 == zhaunzhang.getCode()){
+                                        rechargeRecord.setSurplusDividedAmount(0D);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                    }else{
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        num3 = (num3 >= num1 ? num3 - num1 : 0);
+                    }
+
+                    //开始处理层级抽佣
+                    if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
+                        Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
+                        if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
+                            Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
+                            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 && null != driver1){
+                                    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_ = num5;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                        if(surplusDividedAmount.compareTo(num5_) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num5_, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            num5_ -= surplusDividedAmount;
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num5 ? num3 - num5 : 0);
+                                }
+                                num6 = (num3 >= num6 ? num6 : num3);
+                                if(num6 > 0 && null != driver2){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver2.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num6);
+                                    revenue.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_ = num6;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                        if(surplusDividedAmount.compareTo(num6_) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num6_, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            num6_ -= surplusDividedAmount;
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+
+                                    num3 = (num3 >= num6 ? num3 - num6 : 0);
+                                }
+                                num7 = (num3 >= num7 ? num7 : num3);
+                                if(num7 > 0 && null != driver3){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver3.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num7);
+                                    revenue.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_ = num7;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                        if(surplusDividedAmount.compareTo(num7_) >= 0){
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), num7_, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            num7_ -= surplusDividedAmount;
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }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 && null != driver1){
+                                    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(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            num3_1 -= surplusDividedAmount;
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+                                }
+                                num4 = (num3 >= num4 ? num4 : num3);
+                                if(num4 > 0 && null != driver2){
+                                    Revenue revenue = new Revenue();
+                                    revenue.setType(2);
+                                    revenue.setUserType(2);
+                                    revenue.setUserId(driver2.getId());
+                                    revenue.setOrderId(order.getId());
+                                    revenue.setAmount(num4);
+                                    revenue.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(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }
+                                            break;
+                                        }else{
+                                            num4_1 -= surplusDividedAmount;
+                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                            if(10000 == zhaunzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                            }else{
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num4 ? num3 - num4 : 0);
+                                }
+                            }
+                        }else{
+                            Double num2_ = jsonObject1.getDouble("num2");
+                            num2_ = (num3 >= num2_ ? num2_ : num3);
+                            if(num2_ > 0 && null != driver1){
+                                Revenue revenue = new Revenue();
+                                revenue.setType(2);
+                                revenue.setUserType(2);
+                                revenue.setUserId(driver1.getId());
+                                revenue.setOrderId(order.getId());
+                                revenue.setAmount(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(10000 == zhaunzhang.getCode()){
+                                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
+                                            rechargeRecordService.updateById(rechargeRecord);
+                                        }
+                                        break;
+                                    }else{
+                                        num2_1 -= surplusDividedAmount;
+                                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                        if(10000 == zhaunzhang.getCode()){
+                                            rechargeRecord.setSurplusDividedAmount(0D);
+                                            rechargeRecordService.updateById(rechargeRecord);
+                                        }else{
+                                            break;
+                                        }
+                                    }
+                                }
+
+                                num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+                            }
+                        }
+                    }
+                    //处理代理商抽佣
+                    if(num3 > 0 && null != driver){
+                        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());
+                        Double num3_1 = num3;
+
+                        //补贴中分账
+                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                            if(surplusDividedAmount.compareTo(num3_1) >= 0){
+                                ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
+                                if(10000 == zhaunzhang.getCode()){
+                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                                    rechargeRecordService.updateById(rechargeRecord);
+                                }
+                                break;
+                            }else{
+                                num3_1 -= surplusDividedAmount;
+                                ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                                if(10000 == zhaunzhang.getCode()){
+                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                    rechargeRecordService.updateById(rechargeRecord);
+                                }else{
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        //司机订单收入
+        Revenue revenue = new Revenue();
+        revenue.setType(1);
+        revenue.setUserType(2);
+        revenue.setUserId(driver.getId());
+        revenue.setOrderId(order.getId());
+        revenue.setAmount(payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
+        revenue.setCreateTime(new Date());
+        revenueService.insert(revenue);
+
+        AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+        accountChangeDetail.setUserType(2);
+        accountChangeDetail.setUserId(driver.getId());
+        accountChangeDetail.setType(1);
+        accountChangeDetail.setChangeType(1);
+        accountChangeDetail.setOrderId(order.getId());
+        accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+        accountChangeDetail.setExplain("订单收入");
+        accountChangeDetail.setCreateTime(new Date());
+        driver.setCommission(driver.getCommission() + payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
+        if(null != order.getCouponId()){
+            driver.setCouponBalance(driver.getCouponBalance() + order.getDiscountedPrice());
+            //补贴中分账
+            Double discountedPrice = order.getDiscountedPrice();
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    discountedPrice -= surplusDividedAmount;
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+        }
+        if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+            driver.setCouponBalance(driver.getCouponBalance() + order.getDiscountAmount());
+            //补贴中分账
+            Double discountedPrice = order.getDiscountAmount();
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(order.getDiscountAmount()) >= 0){
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    discountedPrice -= surplusDividedAmount;
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+        accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+        driverService.updateById(driver);
+        accountChangeDetailService.saveData(accountChangeDetail);
+
+        //支付成功---->异步分账----->10s钟后再进行确认收货
+        //确认收货后才能进行提现(结算接口)
+        //异步分账
+
+        if(order.getPayType() == 1){//微信支付
+            //分账司机收入
+            fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);
+
+            if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
+                Double money = order.getPayMoney() - payMoney + order.getDiscountedPrice();
+                fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
+            }
+        }
+        if(order.getPayType() == 2){//余额支付(使用用户的充值数据分账)
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
+                    .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(payMoney) >= 0){
+                    //分账司机收入
+                    ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);
+                    if(10000 == fengzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - payMoney);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    payMoney -= surplusDividedAmount;
+                    ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), surplusDividedAmount, 1);
+                    if(10000 == fengzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+
+
+            if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
+                Double money = order.getPayMoney() - payMoney;
+
+                List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
+                        .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                for (RechargeRecord rechargeRecord : rechargeRecords1) {
+                    Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                    if(surplusDividedAmount.compareTo(money) >= 0){
+                        //分账司机收入
+                        ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
+                        if(10000 == fengzhang.getCode()){
+                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
+                            rechargeRecordService.updateById(rechargeRecord);
+                        }
+                        break;
+                    }else{
+                        payMoney -= surplusDividedAmount;
+                        ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), surplusDividedAmount, 1);
+                        if(10000 == fengzhang.getCode()){
+                            rechargeRecord.setSurplusDividedAmount(0D);
+                            rechargeRecordService.updateById(rechargeRecord);
+                        }else{
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if(order.getPayType() == 4){//微信+余额(使用用户的充值数据分账)
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
+                    .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(payMoney) >= 0){
+                    //分账司机收入
+                    ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);
+                    if(10000 == fengzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - payMoney);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    payMoney -= surplusDividedAmount;
+                    ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), surplusDividedAmount, 1);
+                    if(10000 == fengzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+
+
+            if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
+                Double money = order.getPayMoney() - payMoney;
+
+                List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
+                        .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                for (RechargeRecord rechargeRecord : rechargeRecords1) {
+                    Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                    if(surplusDividedAmount.compareTo(money) >= 0){
+                        //分账司机收入
+                        ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
+                        if(10000 == fengzhang.getCode()){
+                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
+                            rechargeRecordService.updateById(rechargeRecord);
+                        }
+                        break;
+                    }else{
+                        payMoney -= surplusDividedAmount;
+                        ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), surplusDividedAmount, 1);
+                        if(10000 == fengzhang.getCode()){
+                            rechargeRecord.setSurplusDividedAmount(0D);
+                            rechargeRecordService.updateById(rechargeRecord);
+                        }else{
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+
+    }
+
+
+    /**
+     * 分账操作
+     * @param amount
+     */
+    public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
+        DivisionRecord divisionRecord = new DivisionRecord();
+        divisionRecord.setUserType(userType);
+        divisionRecord.setUserId(id);
+        divisionRecord.setOrderId(orderId);
+        divisionRecord.setSourceType(sourceType);
+        divisionRecord.setAmount(amount);
+        divisionRecord.setMerchantNumber(merchantNumber);
+        divisionRecord.setState(1);
+        divisionRecord.setCreateTime(new Date());
+        divisionRecordService.insert(divisionRecord);
+
+        Complete complete = new Complete();
+        complete.setOriginalMerOrderId(merOrderId);
+        complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
+        complete.setParameter1(divisionRecord.getId().toString());
+        //分账方列表
+        List<PamentOrderUser> splitList = new ArrayList<>();
+        PamentOrderUser pamentOrderUser = new PamentOrderUser();
+        pamentOrderUser.setSplitUserId(merchantNumber);
+        pamentOrderUser.setSplitAmount(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 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 uid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<OrderListWarpper> queryMyOrder(Integer uid, Integer pageNum, Integer pageSize) throws Exception {
+        pageNum = (pageNum - 1) * pageSize;
+        return this.baseMapper.queryMyOrder(uid, pageNum, pageSize);
+    }
+
+
+    /**
+     * 获取未开票订单
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<OrderListWarpper> queryNotInvoiceOrder(Integer uid, NotInvoiceOrder notInvoiceOrder) throws Exception {
+        notInvoiceOrder.setPageNum((notInvoiceOrder.getPageNum() - 1) * notInvoiceOrder.getPageSize());;
+        return this.baseMapper.queryNotInvoiceOrder(uid, notInvoiceOrder);
+    }
+
+
 }

--
Gitblit v1.7.1