From 7ee9bc8fb2e42ce2e82cd1eacb57ba584611dfc5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 六月 2023 11:04:32 +0800
Subject: [PATCH] 修改bug

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java            |    5 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java   |   40 +
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java  |   21 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java                    |   25 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java                     |   23 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java           |    2 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java |   44 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java   | 1698 +++++++++++++++++++++++++++++++++++++++++++++---------
 8 files changed, 1,522 insertions(+), 336 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
index f268da2..43c629a 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
@@ -60,6 +60,9 @@
     @Autowired
     private IAccountChangeDetailService accountChangeDetailService;
 
+    @Autowired
+    private IDivisionRecordService divisionRecordService;
+
 
 
 
@@ -247,7 +250,7 @@
             @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
             @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
     })
-    public ResponseWarpper<OrderPriceWarpper> queryOrderPrice(Long orderId){
+    public ResponseWarpper<OrderPriceInfoWarpper> queryOrderPrice(Long orderId){
         if(null == orderId){
             return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
         }
@@ -256,7 +259,7 @@
             if(null == uid){
                 return ResponseWarpper.success(ResultUtil.tokenErr());
             }
-            OrderPriceWarpper orderPriceWarpper = orderService.queryOrderPrice(uid, orderId);
+            OrderPriceInfoWarpper orderPriceWarpper = orderService.queryOrderPrice(uid, orderId);
             return ResponseWarpper.success(orderPriceWarpper);
         }catch (Exception e){
             e.printStackTrace();
@@ -448,24 +451,20 @@
                         return;
                     }
                     String merOrderId = jsonObject.getString("merOrderId");
-                    String orderId = jsonObject.getString("parameter1");
+                    String divisionRecordId = jsonObject.getString("parameter1");
                     //确认收货
                     new Timer().schedule(new TimerTask() {
                         @Override
                         public void run() {
-                            Order order = orderService.selectById(orderId);
-                            List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("userType", 2).eq("orderId", order.getId()));
+                            DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
                             Receive receive = new Receive();//确认收货
                             receive.setOriginalMerOrderId(merOrderId);
-                            receive.setRcvAmount(String.valueOf(Double.valueOf(order.getPayMoney() * 100).intValue()));
+                            receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
                             List<ReceiveUser> splitList = new ArrayList<>();
-                            for (Revenue revenue : revenues) {
-                                Driver driver = driverService.selectById(revenue.getUserId());
-                                ReceiveUser receiveUser = new ReceiveUser();
-                                receiveUser.setSplitUserId(driver.getMerchantNumber());
-                                receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(revenue.getAmount() * 100).intValue()));
-                                splitList.add(receiveUser);
-                            }
+                            ReceiveUser receiveUser = new ReceiveUser();
+                            receiveUser.setSplitUserId(divisionRecord.getMerchantNumber());
+                            receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+                            splitList.add(receiveUser);
                             receive.setSplitList(splitList);
                             TrhRequest<Receive> request1 = new TrhRequest();
                             InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
index 701236b..95cec5f 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
@@ -37,6 +37,11 @@
     @TableField("orderId")
     private Long orderId;
     /**
+     * 充值记录id
+     */
+    @TableField("rechargeRecordId")
+    private Integer rechargeRecordId;
+    /**
      * 第三方分账业务订单id
      */
     @TableField("merOrderId")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
index ee345a0..84b605b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
@@ -163,20 +163,20 @@
     @TableField("overLongDistancePrice")
     private Double overLongDistancePrice;
     /**
-     * 等待时长（分钟）
+     * 等待时长（s）
      */
     @TableField("waitTime")
-    private Double waitTime;
+    private Integer waitTime;
     /**
      * 等待费
      */
     @TableField("waitTimePrice")
     private Double waitTimePrice;
     /**
-     * 超出等待时长（分钟）
+     * 超出等待时长（s）
      */
     @TableField("outWaitTime")
-    private Double outWaitTime;
+    private Integer outWaitTime;
     /**
      * 超出等待时长费
      */
@@ -268,11 +268,26 @@
     @TableField("payTime")
     private Date payTime;
     /**
+     * 微信支付金额
+     */
+    @TableField("weChatPayment")
+    private Double weChatPayment;
+    /**
      * 账户余额支付金额
      */
     @TableField("balancePayment")
     private Double balancePayment;
     /**
+     * 微信支付剩余未分账金额
+     */
+    @TableField("residueWeChatPayment")
+    private Double residueWeChatPayment;
+    /**
+     * 余额支付剩余未分账金额
+     */
+    @TableField("residueBalancePayment")
+    private Double residueBalancePayment;
+    /**
      * 第三方支付流水号
      */
     @TableField("orderNo")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
index 50486e7..7652569 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
@@ -74,7 +74,7 @@
      * @return
      * @throws Exception
      */
-    OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
+    OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
 
 
     /**
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
index 7772e09..e371ad1 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -187,8 +187,10 @@
                 appUser.setStatus(1);
                 appUser.setCreateTime(new Date());
                 appUser.setIsException(1);
-                appUser.setInviterId(signInToRegister.getInviterId());
-                appUser.setInviterType(signInToRegister.getInviterType());
+                if(null != signInToRegister.getInviterId()){
+                    appUser.setInviterId(signInToRegister.getInviterId());
+                    appUser.setInviterType(signInToRegister.getInviterType());
+                }
                 this.insert(appUser);
                 //发送优惠券
                 boolean lock = redisUtil.lock(5);
@@ -272,28 +274,30 @@
                 .eq("coupon_state", 1).eq("status", 1).gt("remaining_quantity", 0));
         List<CouponWarpper> list = new ArrayList<>();
         for (Coupon coupon : coupons) {
-            UserToCoupon userToCoupon = new UserToCoupon();
-            userToCoupon.setCouponId(coupon.getId());
-            userToCoupon.setCreateTime(new Date());
-            userToCoupon.setUserId(userId);
-            userToCoupon.setStatus(1);
-            userToCoupon.setCouponTotal(coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ?
-                    coupon.getRemainingQuantity() : coupon.getCouponSendQuantity());
-            userToCoupon.setValidCount(userToCoupon.getCouponTotal());
-            userToCoupon.setExpireTime(new Date(System.currentTimeMillis() + (coupon.getCouponValidity().longValue() * 24L * 60L * 60L * 1000L)));
-            userToCouponService.insert(userToCoupon);
+            Integer num = coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ?
+                    coupon.getRemainingQuantity() : coupon.getCouponSendQuantity();
+            for (int i = 0; i < num; i++) {
+                UserToCoupon userToCoupon = new UserToCoupon();
+                userToCoupon.setCouponId(coupon.getId());
+                userToCoupon.setCreateTime(new Date());
+                userToCoupon.setUserId(userId);
+                userToCoupon.setStatus(1);
+                userToCoupon.setCouponTotal(1);
+                userToCoupon.setValidCount(1);
+                userToCoupon.setExpireTime(new Date(System.currentTimeMillis() + (coupon.getCouponValidity().longValue() * 24L * 60L * 60L * 1000L)));
+                userToCouponService.insert(userToCoupon);
 
+                CouponWarpper couponWarpper = new CouponWarpper();
+                couponWarpper.setCouponConditionalAmount(coupon.getCouponConditionalAmount());
+                couponWarpper.setCouponPreferentialAmount(coupon.getCouponPreferentialAmount());
+                couponWarpper.setCouponName(coupon.getCouponName());
+                couponWarpper.setNumber(userToCoupon.getValidCount());
+                couponWarpper.setExpirationDate(userToCoupon.getExpireTime().getTime());
+                list.add(couponWarpper);
+            }
             coupon.setRemainingQuantity(coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ? 0 :
                     coupon.getRemainingQuantity() - coupon.getCouponSendQuantity());
             couponService.updateById(coupon);
-
-            CouponWarpper couponWarpper = new CouponWarpper();
-            couponWarpper.setCouponConditionalAmount(coupon.getCouponConditionalAmount());
-            couponWarpper.setCouponPreferentialAmount(coupon.getCouponPreferentialAmount());
-            couponWarpper.setCouponName(coupon.getCouponName());
-            couponWarpper.setNumber(userToCoupon.getValidCount());
-            couponWarpper.setExpirationDate(userToCoupon.getExpireTime().getTime());
-            list.add(couponWarpper);
         }
         return list;
     }
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
index 7e7ab9c..f9c8c63 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
@@ -66,19 +66,26 @@
         Query query = Query.query(Criteria.where("location").withinSphere(circle));
         List<Location> locations = mongoTemplate.find(query, Location.class);
         List<Integer> collect = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+        if(collect.size() == 0){
+            return list;
+        }
         List<Driver> drivers = this.selectList(new EntityWrapper<Driver>().in("id", collect).eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1));
         collect = drivers.stream().map(Driver::getId).collect(Collectors.toList());
+        if(collect.size() == 0){
+            return list;
+        }
         List<DriverWork> driverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", collect).eq("status", 1));
         for (DriverWork driverWork : driverWorks) {
             String value = redisUtil.getValue("DRIVER" + driverWork.getDriverId());
-            if(ToolUtil.isNotEmpty(value)){
-                NearbyDriverWarpper nearbyDriverWarpper = new NearbyDriverWarpper();
-                nearbyDriverWarpper.setLonLat(value);
-                Map<String, Double> distance = GeodesyUtil.getDistance(value, lon + "," + lat);
-                nearbyDriverWarpper.setDistance(distance.get("WGS84") / 1000);
-                nearbyDriverWarpper.setDriverId(driverWork.getDriverId());
-                list.add(nearbyDriverWarpper);
+            if(ToolUtil.isEmpty(value)){
+                continue;
             }
+            NearbyDriverWarpper nearbyDriverWarpper = new NearbyDriverWarpper();
+            nearbyDriverWarpper.setLonLat(value);
+            Map<String, Double> distance = GeodesyUtil.getDistance(value, lon + "," + lat);
+            nearbyDriverWarpper.setDistance(distance.get("WGS84") / 1000);
+            nearbyDriverWarpper.setDriverId(driverWork.getDriverId());
+            list.add(nearbyDriverWarpper);
         }
         return list;
     }
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 57f2464..79c6575 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
@@ -18,6 +18,7 @@
 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 io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -147,7 +148,7 @@
         }
         Order order1 = new Order();
         order1.setCreateTime(new Date());
-        Order order = getOrderPrice(1, d, 0D, order1, city);
+        Order order = getOrderPrice(1, d, 0, order1, city);
         Double estimatedPrice = order.getEstimatedPrice();
         Coupon coupon = userToCouponService.queryCoupon(uid, estimatedPrice);
         if(null != coupon){
@@ -200,9 +201,9 @@
      * @param city          查询天气的城市
      * @return
      */
-    public Order getOrderPrice(Integer type, Double distance, Double waitTime, Order order, String city){
+    public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
         distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
-        waitTime = new BigDecimal(waitTime).setScale(0, BigDecimal.ROUND_UP).doubleValue();
+        waitTime = new BigDecimal(waitTime).setScale(0, BigDecimal.ROUND_UP).intValue();
         order = getOrderInitialPrice(order);
         SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
         if(null == systemConfig){
@@ -294,9 +295,9 @@
         }
 
         //计算额外费用
-        Double num1 = extraCost.getDouble("num1");//等待时长
+        Integer num1 = extraCost.getInteger("num1");//等待时长
         Double num2 = extraCost.getDouble("num2");//等待费
-        Double num3 = extraCost.getDouble("num3");//等待超出时长
+        Integer num3 = extraCost.getInteger("num3");//等待超出时长
         Double num4 = extraCost.getDouble("num4");//等到超出时长费用单价 X/分钟
         Double num5 = extraCost.getDouble("num5");//恶劣天气公里
         Double num6 = extraCost.getDouble("num6");//恶劣天气费
@@ -305,12 +306,12 @@
         Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
 
         //等待费用
-        if(waitTime.compareTo(num1) >= 0){
-            order.setWaitTime(num1);//等待时长
+        if(waitTime.compareTo(num1 * 60) >= 0){
+            order.setWaitTime(num1 * 60);//等待时长
             order.setWaitTimePrice(num2);//等待费用
 
-            Double w = waitTime - num3;
-            BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
+            Integer w = waitTime - (num3 * 60);
+            BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
             order.setOutWaitTime(w);//等待时长超出分钟
             order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
         }
@@ -378,7 +379,7 @@
         order.setOverLongDistancePrice(0d);//超出长途里程费
 //        order.setWaitTime(0);//等待时长
         order.setWaitTimePrice(0D);//等待费
-        order.setOutWaitTime(0D);//超出等待时长
+        order.setOutWaitTime(0);//超出等待时长
         order.setOutWaitTimePrice(0D);//超出等待时长费
         order.setBadWeatherDistance(0D);//恶劣天气里程
         order.setBadWeatherPrice(0D);//恶劣天气里程费
@@ -453,7 +454,7 @@
             city = null != weatherCity ? weatherCity.getId().toString() : "";
         }
         order.setCreateTime(new Date());
-        order = getOrderPrice(1, d, 0D, order, city);
+        order = getOrderPrice(1, d, 0, order, city);
         if(null != travelOrder.getDriverId()){
             DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", travelOrder.getDriverId()).eq("status", 1));
             if(null == driverWork){
@@ -558,7 +559,7 @@
             YouTuiDriver youTuiDriver1 = null;
             if(driverIds.size() > 0){
                 List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
-                        .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
+                        .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
                 Double d = null;
                 for (YouTuiDriver youTuiDriver : youTuiDrivers) {
                     String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
@@ -668,11 +669,16 @@
                 new Timer().schedule(new TimerTask() {
                     @Override
                     public void run() {
-                        driver1.setServerStatus(1);
-                        driverService.updateById(driver1);
-
                         Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                        if(order1.getState() == 101 || order1.getState() == 201){
+                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+                            driver1.setServerStatus(1);
+                            driverService.updateById(driver1);
+                        }
+
+                        if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+                            driver1.setServerStatus(1);
+                            driverService.updateById(driver1);
+
                             order1.setHallOrder(1);
                             OrderServiceImpl.this.updateById(order1);
                             ExtraPushOrder(order);
@@ -754,6 +760,7 @@
         cancelOrderService.insert(cancelOrder);
         order.setState(301);
         this.updateById(order);
+        redisUtil.delSetValue("orderService", order.getId().toString());
         AppUser appUser = appUserService.selectById(uid);
         appUser.setCancelCount(appUser.getCancelCount() + 1);
         if(appUser.getCancelCount() >= 3){
@@ -835,7 +842,7 @@
         }
         Order order1 = new Order();
         BeanUtils.copyProperties(order, order1);
-        Order orderPrice = getOrderPrice(1, d, 0D, order1, city);
+        Order orderPrice = getOrderPrice(1, d, 0, order1, city);
         order.setEstimatedPrice(orderPrice.getEstimatedPrice());
         this.updateById(order);
 
@@ -857,17 +864,35 @@
      * @throws Exception
      */
     @Override
-    public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
+    public OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
         Order order = this.selectById(orderId);
-        Coupon coupon = userToCouponService.queryCoupon(uid, order.getOrderMoney());
-        OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
-        BeanUtils.copyProperties(order, orderPriceWarpper);
-        if(null != coupon){
-            orderPriceWarpper.setCouponId(coupon.getId());
-            orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+        OrderPriceInfoWarpper orderPriceWarpper = new OrderPriceInfoWarpper();
+        orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
+        orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
+        orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
+        if(null != order.getStartPrice() && 0 != order.getStartPrice()){
+            orderPriceWarpper.setStartPrice(order.getStartPrice());
+            orderPriceWarpper.setStartDistance(order.getStartDistance());
+            orderPriceWarpper.setOverDriveDistance(order.getOverDriveDistance());
+            orderPriceWarpper.setMileageFee(order.getOverDrivePrice());
+        }else{
+            String[] split = order.getLongDistance().split("-");
+            orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+            orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+            orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+            orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
         }
-        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());
+        Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
+        Integer s = waitTime % 60;
+        int m = Double.valueOf(waitTime / 60).intValue();
+        orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
+        orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
+        orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
+        orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
+        orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
+        if(null == order.getPayMoney()){
+            orderPriceWarpper.setPayMoney(order.getOrderMoney());
+        }
         return orderPriceWarpper;
     }
 
@@ -892,14 +917,18 @@
         orderPriceWarpper.setBalance(appUser.getAccountBalance());
         orderPriceWarpper.setDiscount(0D);
         orderPriceWarpper.setDiscountAmount(0D);
-        orderPriceWarpper.setPayType(1);//微信支付
+        orderPriceWarpper.setPayType(order.getPayType());//微信支付
+        if(null == order.getPayType() && -1 == payType){
+            orderPriceWarpper.setPayType(1);
+            payType = 0;
+        }
         Double orderMoney = order.getOrderMoney();
         //先算优惠券
-//        Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
-//        if(null != coupon && null == couponId){
-//            orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-//            orderPriceWarpper.setCouponId(coupon.getId());
-//        }
+        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());
@@ -1104,22 +1133,6 @@
                 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.getCouponBalance() + driver.getCommission());
-                accountChangeDetail.setType(1);
-                accountChangeDetail.setChangeType(7);
-                accountChangeDetail.setOrderId(order.getId());
-                accountChangeDetail.setExplain("优惠券收入");
-                driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
-                accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
-                driverService.updateById(driver);
-                accountChangeDetailService.insert(accountChangeDetail);
             }
         }
 
@@ -1160,7 +1173,7 @@
         accountChangeDetailService.insert(accountChangeDetail);
 
         //处理佣金和收入记录
-        saveCommission(order);
+        saveCommissionYE(order);
         return ResultUtil.success();
     }
 
@@ -1184,27 +1197,15 @@
                 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.getCouponBalance() + driver.getCommission());
-                accountChangeDetail.setType(1);
-                accountChangeDetail.setChangeType(7);
-                accountChangeDetail.setOrderId(order.getId());
-                accountChangeDetail.setExplain("优惠券收入");
-                driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
-                accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
-                driverService.updateById(driver);
-                accountChangeDetailService.insert(accountChangeDetail);
             }
         }
+
         order.setPayType(1);
         order.setPayMoney(payMoney);
         order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);
+        order.setWeChatPayment(payMoney);
+        order.setResidueBalancePayment(order.getBalancePayment());
+        order.setResidueWeChatPayment(order.getWeChatPayment());
 
         payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
 
@@ -1224,6 +1225,7 @@
         accountChangeDetailService.insert(accountChangeDetail);
 
         if(0 < payMoney){//还需要调起微信支付
+            order.setPayType(4);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             String out_trade_no = sdf.format(new Date()) + order.getId();
 
@@ -1321,7 +1323,7 @@
             this.updateById(order);
 
             //处理佣金和收入记录
-            saveCommission(order);
+            saveCommissionYE(order);
         }
         return ResultUtil.success();
 
@@ -1344,7 +1346,12 @@
         order.setOrderNo(transaction_id);
         this.updateById(order);
         //添加收入明细
-        saveCommission(order);
+        if(order.getPayType() == 4){
+            saveCommissionWXANDYU(order);
+        }
+        if(order.getPayType() == 1){
+            saveCommissionWX(order);
+        }
 
         pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
         if(null != order.getDriverId()) {
@@ -1439,14 +1446,12 @@
 
 
     /**
-     * 处理订单收入及分佣抽成
+     * 微信支付分佣
      * @param order
      * @return
      * @throws Exception
      */
-    public void saveCommission(Order order) throws Exception{
-        //司机收入和代理商抽成(先分佣，后抽成)
-        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+    public void saveCommissionWX(Order order) throws Exception{
         Driver driver = driverService.selectById(order.getDriverId());
         AppUser appUser = appUserService.selectById(order.getUserId());
 
@@ -1477,14 +1482,14 @@
 
 
 
-        Double payMoney = order.getPayMoney();//todo 司机订单收入归并到佣金中一起提现
+        //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.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
-                payMoney = payMoney - num3;//司机收入
+
                 SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
                 if(null != systemConfig1){
                     JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
@@ -1518,24 +1523,437 @@
                             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"));
+                            //订单分账
+                            fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num1, 1);
+                        }
+                        num3 = (num3 >= num1 ? num3 - num1 : 0);
+                    }
+
+                    //开始处理层级抽佣
+                    if(num3 > 0 &&  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.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver1.setCommission(driver1.getCommission() + num5);
+                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driverService.updateById(driver1);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num5, 1);
+
+                                    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.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver2.setCommission(driver2.getCommission() + num6);
+                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driverService.updateById(driver2);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num6, 1);
+                                    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.getCouponBalance() + driver3.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver3.setCommission(driver3.getCommission() + num7);
+                                    accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+                                    driverService.updateById(driver3);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num7, 1);
+
+                                    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.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver1.setCommission(driver1.getCommission() + num3_);
+                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driverService.updateById(driver1);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_, 1);
+
+                                    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.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver2.setCommission(driver2.getCommission() + num4);
+                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driverService.updateById(driver2);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num4, 1);
+
+                                    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.getCouponBalance() + driver1.getCommission());
+                                accountChangeDetail.setExplain("订单分佣收入");
+                                accountChangeDetail.setCreateTime(new Date());
+                                driver1.setCommission(driver1.getCommission() + num2_);
+                                accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                driverService.updateById(driver1);
+                                accountChangeDetailService.saveData(accountChangeDetail);
+
+                                //订单分账
+                                fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num2_, 1);
+
+                                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());
+                        //订单分账
+                        fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3, 1);
+                    }
+                }
+            }
+        }
+
+        driver = driverService.selectById(order.getDriverId());
+        //司机订单收入
+        Revenue revenue = new Revenue();
+        revenue.setType(1);
+        revenue.setUserType(2);
+        revenue.setUserId(driver.getId());
+        revenue.setOrderId(order.getId());
+        revenue.setAmount(order.getPayMoney() + 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.getCouponBalance() + driver.getCommission());
+        driver.setCommission(driver.getCommission() + order.getPayMoney());
+        accountChangeDetail.setExplain("订单收入");
+        accountChangeDetail.setCreateTime(new Date());
+        accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+        driverService.updateById(driver);
+        accountChangeDetailService.saveData(accountChangeDetail);
+        //订单收入
+        fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), order.getPayMoney(), 1);
+
+        if(null != order.getCouponId()){
+            accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver.getId());
+            accountChangeDetail.setType(1);
+            accountChangeDetail.setChangeType(7);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+            driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+            accountChangeDetail.setExplain("优惠券收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
+
+            //补贴中分账
+            Double discountedPrice = order.getDiscountedPrice();
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(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{
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        discountedPrice -= surplusDividedAmount;
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+        }
+        if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+            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.getCouponBalance() + driver.getCommission());
+            driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+            accountChangeDetail.setExplain("折扣优惠收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
+
+            //补贴中分账
+            Double discountedPrice = order.getDiscountAmount();
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(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{
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        discountedPrice -= surplusDividedAmount;
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 余额支付分账
+     * @param order
+     * @throws Exception
+     */
+    public void saveCommissionYE(Order order) throws Exception{
+        //司机收入和代理商抽成(先分佣，后抽成)
+        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+        Driver driver = driverService.selectById(order.getDriverId());
+        AppUser appUser = appUserService.selectById(order.getUserId());
+
+        //首单积分奖励
+        //司机推荐首单收入
+        List<Integer> state = Arrays.asList(107, 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){
+            Driver driver1 = driverService.selectById(appUser.getInviterId());
+            SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+            JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+            Integer num4 = jsonObject2.getInteger("num4");
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver1.getId());
+            accountChangeDetail.setType(2);
+            accountChangeDetail.setChangeType(5);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+            accountChangeDetail.setExplain("邀请用户首单积分奖励");
+            accountChangeDetail.setCreateTime(new Date());
+            driver1.setIntegral(driver1.getIntegral() + num4);
+            accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+            accountChangeDetailService.insert(accountChangeDetail);
+            driverService.updateById(driver1);
+        }
+
+
+
+        //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.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+
+                SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
+                if(null != systemConfig1){
+                    JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
+                    //司机推荐用户收入
+                    if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+                        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.getCouponBalance() + driver1.getCommission());
+                            accountChangeDetail.setExplain("邀请用户奖励");
+                            accountChangeDetail.setCreateTime(new Date());
+                            driver1.setCommission(driver1.getCommission() + num1);
+                            accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                            driverService.updateById(driver1);
+                            accountChangeDetailService.saveData(accountChangeDetail);
+
+                            Revenue revenue = new Revenue();
+                            revenue.setType(2);
+                            revenue.setUserType(2);
+                            revenue.setUserId(driver1.getId());
+                            revenue.setOrderId(order.getId());
+                            revenue.setAmount(num1);
+                            revenue.setCreateTime(new Date());
+                            revenueService.insert(revenue);
+
+                            //用户充值记录分账
+                            Double num1_1 = num1;
+                            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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_);
+                                if(surplusDividedAmount.compareTo(num1_1) >= 0){
+                                    ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+                                    if(10000 == fengzhang.getCode()){
+                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
                                         rechargeRecordService.updateById(rechargeRecord);
                                     }
                                     break;
                                 }else{
-                                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                    if(10000 == zhaunzhang.getCode()){
+                                    ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                    if(10000 == fengzhang.getCode()){
                                         rechargeRecord.setSurplusDividedAmount(0D);
                                         rechargeRecordService.updateById(rechargeRecord);
-                                        num1_ -= surplusDividedAmount;
+                                        num1_1 -= surplusDividedAmount;
                                     }else{
                                         break;
                                     }
@@ -1580,24 +1998,24 @@
                                     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"));
+                                    //用户充值记录分账
+                                    Double num5_1 = num5;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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_);
+                                        if(surplusDividedAmount.compareTo(num5_1) >= 0){
+                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+                                            if(10000 == fengzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
                                         }else{
-                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                            if(10000 == zhaunzhang.getCode()){
+                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(0D);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num5_ -= surplusDividedAmount;
+                                                num5_1 -= surplusDividedAmount;
                                             }else{
                                                 break;
                                             }
@@ -1631,31 +2049,29 @@
                                     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"));
+                                    //用户充值记录分账
+                                    Double num6_1 = num6;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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_);
+                                        if(surplusDividedAmount.compareTo(num6_1) >= 0){
+                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+                                            if(10000 == fengzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
                                         }else{
-                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                            if(10000 == zhaunzhang.getCode()){
+                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(0D);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num6_ -= surplusDividedAmount;
+                                                num6_1 -= surplusDividedAmount;
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-
                                     num3 = (num3 >= num6 ? num3 - num6 : 0);
                                 }
                                 num7 = (num3 >= num7 ? num7 : num3);
@@ -1683,24 +2099,24 @@
                                     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"));
+                                    //用户充值记录分账
+                                    Double num7_1 = num7;
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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_);
+                                        if(surplusDividedAmount.compareTo(num7_1) >= 0){
+                                            ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+                                            if(10000 == fengzhang.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
                                         }else{
-                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                            if(10000 == zhaunzhang.getCode()){
+                                            ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(0D);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num7_ -= surplusDividedAmount;
+                                                num7_1 -= surplusDividedAmount;
                                             }else{
                                                 break;
                                             }
@@ -1737,21 +2153,21 @@
                                     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"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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()){
+                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
                                         }else{
-                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                            if(10000 == zhaunzhang.getCode()){
+                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(0D);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                                 num3_1 -= surplusDividedAmount;
@@ -1788,21 +2204,21 @@
                                     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"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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()){
+                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
                                         }else{
-                                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                            if(10000 == zhaunzhang.getCode()){
+                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang.getCode()){
                                                 rechargeRecord.setSurplusDividedAmount(0D);
                                                 rechargeRecordService.updateById(rechargeRecord);
                                                 num4_1 -= surplusDividedAmount;
@@ -1842,21 +2258,21 @@
                                 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"));
+                                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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()){
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+                                        if(10000 == fengzhang.getCode()){
                                             rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
                                             rechargeRecordService.updateById(rechargeRecord);
                                         }
                                         break;
                                     }else{
-                                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                        if(10000 == zhaunzhang.getCode()){
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                        if(10000 == fengzhang.getCode()){
                                             rechargeRecord.setSurplusDividedAmount(0D);
                                             rechargeRecordService.updateById(rechargeRecord);
                                             num2_1 -= surplusDividedAmount;
@@ -1882,22 +2298,21 @@
                         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"));
+                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).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()){
+                                ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                                if(10000 == fengzhang.getCode()){
                                     rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
                                     rechargeRecordService.updateById(rechargeRecord);
                                 }
                                 break;
                             }else{
-                                ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                                if(10000 == zhaunzhang.getCode()){
+                                ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                if(10000 == fengzhang.getCode()){
                                     rechargeRecord.setSurplusDividedAmount(0D);
                                     rechargeRecordService.updateById(rechargeRecord);
                                     num3_1 -= surplusDividedAmount;
@@ -1918,23 +2333,847 @@
         revenue.setUserType(2);
         revenue.setUserId(driver.getId());
         revenue.setOrderId(order.getId());
-        revenue.setAmount(payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
+        revenue.setAmount(order.getPayMoney() + 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.getCouponBalance() + driver.getCommission());
-        driver.setCommission(driver.getCommission() + payMoney);
-        accountChangeDetail.setExplain("订单收入");
-        accountChangeDetail.setCreateTime(new Date());
+        AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+        accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+        accountChangeDetail1.setUserType(2);
+        accountChangeDetail1.setUserId(driver.getId());
+        accountChangeDetail1.setType(1);
+        accountChangeDetail1.setChangeType(1);
+        accountChangeDetail1.setOrderId(order.getId());
+        accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());
+        driver.setCommission(driver.getCommission() + order.getPayMoney());
+        accountChangeDetail1.setExplain("订单收入");
+        accountChangeDetail1.setCreateTime(new Date());
+        accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());
+        driverService.updateById(driver);
+        accountChangeDetailService.saveData(accountChangeDetail1);
+
+        //用户充值记录分账
+        Double num3_1 = order.getPayMoney();
+        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+        for (RechargeRecord rechargeRecord : rechargeRecords) {
+            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+            if(surplusDividedAmount.compareTo(num3_1) >= 0){
+                ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                if(10000 == fengzhang.getCode()){
+                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                    rechargeRecordService.updateById(rechargeRecord);
+                }
+                break;
+            }else{
+                ResultUtil fengzhang = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                if(10000 == fengzhang.getCode()){
+                    rechargeRecord.setSurplusDividedAmount(0D);
+                    rechargeRecordService.updateById(rechargeRecord);
+                    num3_1 -= surplusDividedAmount;
+                }else{
+                    break;
+                }
+            }
+        }
+
+
         if(null != order.getCouponId()){
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver.getId());
+            accountChangeDetail.setType(1);
+            accountChangeDetail.setChangeType(7);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
             driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+            accountChangeDetail.setExplain("优惠券收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
+
+            //补贴中分账
+            Double discountedPrice = order.getDiscountedPrice();
+            List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords1) {
+                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{
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        discountedPrice -= surplusDividedAmount;
+                    }else{
+                        break;
+                    }
+                }
+            }
+
+        }
+        if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+            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.getCouponBalance() + driver.getCommission());
+            driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+            accountChangeDetail.setExplain("折扣优惠收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
+            //补贴中分账
+            Double discountedPrice = order.getDiscountAmount();
+            List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords1) {
+                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{
+                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        discountedPrice -= surplusDividedAmount;
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 微信+余额支付分账
+     * @param order
+     * @throws Exception
+     */
+    public void saveCommissionWXANDYU(Order order) throws Exception{
+        //司机收入和代理商抽成(先分佣，后抽成)
+        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+        Driver driver = driverService.selectById(order.getDriverId());
+        AppUser appUser = appUserService.selectById(order.getUserId());
+
+        //首单积分奖励
+        //司机推荐首单收入
+        List<Integer> state = Arrays.asList(107, 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){
+            Driver driver1 = driverService.selectById(appUser.getInviterId());
+            SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+            JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+            Integer num4 = jsonObject2.getInteger("num4");
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver1.getId());
+            accountChangeDetail.setType(2);
+            accountChangeDetail.setChangeType(5);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+            accountChangeDetail.setExplain("邀请用户首单积分奖励");
+            accountChangeDetail.setCreateTime(new Date());
+            driver1.setIntegral(driver1.getIntegral() + num4);
+            accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+            accountChangeDetailService.insert(accountChangeDetail);
+            driverService.updateById(driver1);
+        }
+
+
+
+        //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.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+                SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
+                if(null != systemConfig1){
+                    JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
+                    //司机推荐用户收入
+                    if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+                        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.getCouponBalance() + driver1.getCommission());
+                            accountChangeDetail.setExplain("邀请用户奖励");
+                            accountChangeDetail.setCreateTime(new Date());
+                            driver1.setCommission(driver1.getCommission() + num1);
+                            accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                            driverService.updateById(driver1);
+                            accountChangeDetailService.saveData(accountChangeDetail);
+
+                            Revenue revenue = new Revenue();
+                            revenue.setType(2);
+                            revenue.setUserType(2);
+                            revenue.setUserId(driver1.getId());
+                            revenue.setOrderId(order.getId());
+                            revenue.setAmount(num1);
+                            revenue.setCreateTime(new Date());
+                            revenueService.insert(revenue);
+
+                            Double num1_1 = num1;
+                            Double residueWeChatPayment = order.getResidueWeChatPayment();
+                            Double residueBalancePayment = order.getResidueBalancePayment();
+                            if(residueWeChatPayment.compareTo(num1_1) >= 0){
+                                ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num1_1, 1);
+                                if(10000 != fengzhang.getCode()){
+                                    return;
+                                }
+                                order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num1_1);
+                            }else{
+                                ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                if(10000 != fengzhang.getCode()){
+                                    return;
+                                }
+                                order.setResidueWeChatPayment(0D);
+                                num1_1 -= residueWeChatPayment;
+
+                                //账户余额继续分账
+                                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                    Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                    if(surplusDividedAmount.compareTo(num1_1) >= 0){
+                                        ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+                                        if(10000 == fengzhang1.getCode()){
+                                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
+                                            rechargeRecordService.updateById(rechargeRecord);
+                                            order.setResidueBalancePayment(residueBalancePayment - num1_1);
+                                        }
+                                        break;
+                                    }else{
+                                        ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                        if(10000 == fengzhang1.getCode()){
+                                            rechargeRecord.setSurplusDividedAmount(0D);
+                                            rechargeRecordService.updateById(rechargeRecord);
+                                            num1_1 -= surplusDividedAmount;
+                                            order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                        }else{
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+
+                        }
+                        num3 = (num3 >= num1 ? num3 - num1 : 0);
+                    }
+
+                    //开始处理层级抽佣
+                    if(num3 > 0 &&  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.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver1.setCommission(driver1.getCommission() + num5);
+                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driverService.updateById(driver1);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    Double num5_1 = num5;
+                                    Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                    Double residueBalancePayment = order.getResidueBalancePayment();
+                                    if(residueWeChatPayment.compareTo(num5_1) >= 0){
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num5_1, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num5_1);
+                                    }else{
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(0D);
+                                        num5_1 -= residueWeChatPayment;
+
+                                        //账户余额继续分账
+                                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                            if(surplusDividedAmount.compareTo(num5_1) >= 0){
+                                                ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    order.setResidueBalancePayment(residueBalancePayment - num5_1);
+                                                }
+                                                break;
+                                            }else{
+                                                ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    num5_1 -= surplusDividedAmount;
+                                                    order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                                }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.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver2.setCommission(driver2.getCommission() + num6);
+                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driverService.updateById(driver2);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    Double num6_1 = num6;
+                                    Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                    Double residueBalancePayment = order.getResidueBalancePayment();
+                                    if(residueWeChatPayment.compareTo(num6_1) >= 0){
+                                        ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num6_1, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num6_1);
+                                    }else{
+                                        ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(0D);
+                                        num6_1 -= residueWeChatPayment;
+
+                                        //账户余额继续分账
+                                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                            if(surplusDividedAmount.compareTo(num6_1) >= 0){
+                                                ResultUtil fengzhang1 = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    order.setResidueBalancePayment(residueBalancePayment - num6_1);
+                                                }
+                                                break;
+                                            }else{
+                                                ResultUtil fengzhang1 = fengzhang(2, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    num6_1 -= surplusDividedAmount;
+                                                    order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                                }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.getCouponBalance() + driver3.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver3.setCommission(driver3.getCommission() + num7);
+                                    accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+                                    driverService.updateById(driver3);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    Double num7_1 = num7;
+                                    Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                    Double residueBalancePayment = order.getResidueBalancePayment();
+                                    if(residueWeChatPayment.compareTo(num7_1) >= 0){
+                                        ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num7_1, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num7_1);
+                                    }else{
+                                        ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(0D);
+                                        num7_1 -= residueWeChatPayment;
+
+                                        //账户余额继续分账
+                                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                            if(surplusDividedAmount.compareTo(num7_1) >= 0){
+                                                ResultUtil fengzhang1 = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    order.setResidueBalancePayment(residueBalancePayment - num7_1);
+                                                }
+                                                break;
+                                            }else{
+                                                ResultUtil fengzhang1 = fengzhang(2, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    num7_1 -= surplusDividedAmount;
+                                                    order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                                }else{
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+
+                                    num3 = (num3 >= num7 ? num3 - num7 : 0);
+                                }
+                            }else{
+                                Double num3_ = jsonObject1.getDouble("num3");
+                                Double num4 = jsonObject1.getDouble("num4");
+                                num3_ = (num3 >= num3_ ? num3_ : num3);
+                                if(num3_ > 0 && 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.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver1.setCommission(driver1.getCommission() + num3_);
+                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driverService.updateById(driver1);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    Double num3_1 = num3_;
+                                    Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                    Double residueBalancePayment = order.getResidueBalancePayment();
+                                    if(residueWeChatPayment.compareTo(num3_1) >= 0){
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+                                    }else{
+                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(0D);
+                                        num3_1 -= residueWeChatPayment;
+
+                                        //账户余额继续分账
+                                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                            if(surplusDividedAmount.compareTo(num3_1) >= 0){
+                                                ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    order.setResidueBalancePayment(residueBalancePayment - num3_1);
+                                                }
+                                                break;
+                                            }else{
+                                                ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    num3_1 -= surplusDividedAmount;
+                                                    order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                                }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.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setExplain("订单分佣收入");
+                                    accountChangeDetail.setCreateTime(new Date());
+                                    driver2.setCommission(driver2.getCommission() + num4);
+                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driverService.updateById(driver2);
+                                    accountChangeDetailService.saveData(accountChangeDetail);
+
+                                    //订单分账
+                                    Double num4_1 = num4;
+                                    Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                    Double residueBalancePayment = order.getResidueBalancePayment();
+                                    if(residueWeChatPayment.compareTo(num4_1) >= 0){
+                                        ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num4_1, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num4_1);
+                                    }else{
+                                        ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                        if(10000 != fengzhang.getCode()){
+                                            return;
+                                        }
+                                        order.setResidueWeChatPayment(0D);
+                                        num4_1 -= residueWeChatPayment;
+
+                                        //账户余额继续分账
+                                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                        for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                            Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                            if(surplusDividedAmount.compareTo(num4_1) >= 0){
+                                                ResultUtil fengzhang1 = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    order.setResidueBalancePayment(residueBalancePayment - num4_1);
+                                                }
+                                                break;
+                                            }else{
+                                                ResultUtil fengzhang1 = fengzhang(2, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                                if(10000 == fengzhang1.getCode()){
+                                                    rechargeRecord.setSurplusDividedAmount(0D);
+                                                    rechargeRecordService.updateById(rechargeRecord);
+                                                    num4_1 -= surplusDividedAmount;
+                                                    order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                                }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.getCouponBalance() + driver1.getCommission());
+                                accountChangeDetail.setExplain("订单分佣收入");
+                                accountChangeDetail.setCreateTime(new Date());
+                                driver1.setCommission(driver1.getCommission() + num2_);
+                                accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                driverService.updateById(driver1);
+                                accountChangeDetailService.saveData(accountChangeDetail);
+
+                                //订单分账
+                                Double num2_1 = num2_;
+                                Double residueWeChatPayment = order.getResidueWeChatPayment();
+                                Double residueBalancePayment = order.getResidueBalancePayment();
+                                if(residueWeChatPayment.compareTo(num2_1) >= 0){
+                                    ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num2_1, 1);
+                                    if(10000 != fengzhang.getCode()){
+                                        return;
+                                    }
+                                    order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num2_1);
+                                }else{
+                                    ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                                    if(10000 != fengzhang.getCode()){
+                                        return;
+                                    }
+                                    order.setResidueWeChatPayment(0D);
+                                    num2_1 -= residueWeChatPayment;
+
+                                    //账户余额继续分账
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                        if(surplusDividedAmount.compareTo(num2_1) >= 0){
+                                            ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+                                            if(10000 == fengzhang1.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                order.setResidueBalancePayment(residueBalancePayment - num2_1);
+                                            }
+                                            break;
+                                        }else{
+                                            ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                            if(10000 == fengzhang1.getCode()){
+                                                rechargeRecord.setSurplusDividedAmount(0D);
+                                                rechargeRecordService.updateById(rechargeRecord);
+                                                num2_1 -= surplusDividedAmount;
+                                                order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                            }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;
+                        Double residueWeChatPayment = order.getResidueWeChatPayment();
+                        Double residueBalancePayment = order.getResidueBalancePayment();
+                        if(residueWeChatPayment.compareTo(num3_1) >= 0){
+                            ResultUtil fengzhang = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+                            if(10000 != fengzhang.getCode()){
+                                return;
+                            }
+                            order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+                        }else{
+                            ResultUtil fengzhang = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+                            if(10000 != fengzhang.getCode()){
+                                return;
+                            }
+                            order.setResidueWeChatPayment(0D);
+                            num3_1 -= residueWeChatPayment;
+
+                            //账户余额继续分账
+                            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                                if(surplusDividedAmount.compareTo(num3_1) >= 0){
+                                    ResultUtil fengzhang1 = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                                    if(10000 == fengzhang1.getCode()){
+                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                        order.setResidueBalancePayment(residueBalancePayment - num3_1);
+                                    }
+                                    break;
+                                }else{
+                                    ResultUtil fengzhang1 = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                                    if(10000 == fengzhang1.getCode()){
+                                        rechargeRecord.setSurplusDividedAmount(0D);
+                                        rechargeRecordService.updateById(rechargeRecord);
+                                        num3_1 -= surplusDividedAmount;
+                                        order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                                    }else{
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        driver = driverService.selectById(order.getDriverId());
+        //司机订单收入
+        Revenue revenue = new Revenue();
+        revenue.setType(1);
+        revenue.setUserType(2);
+        revenue.setUserId(driver.getId());
+        revenue.setOrderId(order.getId());
+        revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
+        revenue.setCreateTime(new Date());
+        revenueService.insert(revenue);
+
+        AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+        accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+        accountChangeDetail1.setUserType(2);
+        accountChangeDetail1.setUserId(driver.getId());
+        accountChangeDetail1.setType(1);
+        accountChangeDetail1.setChangeType(1);
+        accountChangeDetail1.setOrderId(order.getId());
+        accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());
+        driver.setCommission(driver.getCommission() + order.getPayMoney());
+        accountChangeDetail1.setExplain("订单收入");
+        accountChangeDetail1.setCreateTime(new Date());
+        accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());
+        driverService.updateById(driver);
+        accountChangeDetailService.saveData(accountChangeDetail1);
+
+        //订单分账
+        Double num3_1 = order.getPayMoney();
+        Double residueWeChatPayment = order.getResidueWeChatPayment();
+        Double residueBalancePayment = order.getResidueBalancePayment();
+        if(residueWeChatPayment.compareTo(num3_1) >= 0){
+            ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+            if(10000 != fengzhang.getCode()){
+                return;
+            }
+            order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+        }else{
+            ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+            if(10000 != fengzhang.getCode()){
+                return;
+            }
+            order.setResidueWeChatPayment(0D);
+            num3_1 -= residueWeChatPayment;
+
+            //账户余额继续分账
+            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+            for (RechargeRecord rechargeRecord : rechargeRecords) {
+                Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+                if(surplusDividedAmount.compareTo(num3_1) >= 0){
+                    ResultUtil fengzhang1 = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+                    if(10000 == fengzhang1.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        order.setResidueBalancePayment(residueBalancePayment - num3_1);
+                    }
+                    break;
+                }else{
+                    ResultUtil fengzhang1 = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+                    if(10000 == fengzhang1.getCode()){
+                        rechargeRecord.setSurplusDividedAmount(0D);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        num3_1 -= surplusDividedAmount;
+                        order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+        this.updateById(order);
+
+        if(null != order.getCouponId()){
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(driver.getId());
+            accountChangeDetail.setType(1);
+            accountChangeDetail.setChangeType(7);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+            driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+            accountChangeDetail.setExplain("优惠券收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
             //补贴中分账
             Double discountedPrice = order.getDiscountedPrice();
             List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
@@ -1961,7 +3200,20 @@
 
         }
         if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+            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.getCouponBalance() + driver.getCommission());
             driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+            accountChangeDetail.setExplain("折扣优惠收入");
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+            driverService.updateById(driver);
+            accountChangeDetailService.saveData(accountChangeDetail);
             //补贴中分账
             Double discountedPrice = order.getDiscountAmount();
             List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
@@ -1986,156 +3238,20 @@
                 }
             }
         }
-        accountChangeDetail.setNewData(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(), rechargeRecord.getOrderNumber(), payMoney, 1);
-                    if(10000 == fengzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - payMoney);
-                        rechargeRecordService.updateById(rechargeRecord);
-                    }
-                    break;
-                }else{
-                    ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
-                    if(10000 == fengzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(0D);
-                        rechargeRecordService.updateById(rechargeRecord);
-                        payMoney -= surplusDividedAmount;
-                    }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(), rechargeRecord.getOrderNumber(), money, 1);
-                        if(10000 == fengzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
-                            rechargeRecordService.updateById(rechargeRecord);
-                        }
-                        break;
-                    }else{
-                        ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
-                        if(10000 == fengzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
-                            rechargeRecordService.updateById(rechargeRecord);
-                            payMoney -= surplusDividedAmount;
-                        }else{
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if(order.getPayType() == 4){//微信+余额(使用用户的充值数据分账)
-            Double xj = order.getPayMoney() - order.getBalancePayment();
-            if(xj > 0){
-                //分账司机收入
-                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);
-                }
-            }else{
-                Double balancePayment = order.getBalancePayment();
-                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(balancePayment) >= 0){
-                        //分账司机收入
-                        ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), balancePayment, 1);
-                        if(10000 == fengzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - balancePayment);
-                            rechargeRecordService.updateById(rechargeRecord);
-                        }
-                        break;
-                    }else{
-                        ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
-                        if(10000 == fengzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
-                            rechargeRecordService.updateById(rechargeRecord);
-                            balancePayment -= surplusDividedAmount;
-                        }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(), rechargeRecord.getOrderNumber(), money, 1);
-                            if(10000 == fengzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
-                                rechargeRecordService.updateById(rechargeRecord);
-                            }
-                            break;
-                        }else{
-                            ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
-                            if(10000 == fengzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(0D);
-                                rechargeRecordService.updateById(rechargeRecord);
-                                payMoney -= surplusDividedAmount;
-                            }else{
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
+
 
 
     /**
      * 分账操作
      * @param amount
      */
-    public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
+    public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType){
         DivisionRecord divisionRecord = new DivisionRecord();
         divisionRecord.setUserType(userType);
         divisionRecord.setUserId(id);
         divisionRecord.setOrderId(orderId);
+        divisionRecord.setRechargeRecordId(rechargeRecordId);
         divisionRecord.setSourceType(sourceType);
         divisionRecord.setAmount(amount);
         divisionRecord.setMerchantNumber(merchantNumber);
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
new file mode 100644
index 0000000..065520b
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
@@ -0,0 +1,40 @@
+package com.supersavedriving.user.modular.system.warpper;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/6/20 18:12
+ */
+@Data
+@ApiModel
+public class OrderPriceInfoWarpper {
+    @ApiModelProperty("订单开始时间")
+    private Long startTime;
+    @ApiModelProperty("订单结束时间")
+    private Long endTime;
+    @ApiModelProperty("总行驶里程")
+    private Double actualMileage;
+    @ApiModelProperty("起步价")
+    private Double startPrice;
+    @ApiModelProperty("起步里程")
+    private Double startDistance;
+    @ApiModelProperty("超出起步里程")
+    private Double overDriveDistance;
+    @ApiModelProperty("里程费")
+    private Double mileageFee;
+    @ApiModelProperty("等待时长")
+    private String waitTime;
+    @ApiModelProperty("等待费")
+    private Double waitTimePrice;
+    @ApiModelProperty("折扣金额")
+    private Double discountAmount;
+    @ApiModelProperty("优惠券金额")
+    private Double discountedPrice;
+    @ApiModelProperty("恶劣天气费")
+    private Double badWeatherPrice;
+    @ApiModelProperty("支付金额")
+    private Double payMoney;
+}

--
Gitblit v1.7.1