From 4f8b61980b0db5995c16139d8eb9542b66da8a9f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 27 六月 2023 11:58:21 +0800
Subject: [PATCH] 修改bug

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java               |  189 ++----
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java |    2 
 driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java                                        |   72 +
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java                  |    6 
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java                               |    9 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java                                   |    2 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java                 |   14 
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java                                   |    2 
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java                         |   14 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java                                    |   16 
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java                   |    4 
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java          |   38 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java                   | 1264 ++++----------------------------------------
 13 files changed, 317 insertions(+), 1,315 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index b1182c1..ee7f73e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -26,6 +26,8 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +46,8 @@
 @RestController
 @RequestMapping("")
 public class OrderController {
+
+    Logger logger = LoggerFactory.getLogger(OrderController.class);
 
     @Autowired
     private IOrderService orderService;
@@ -580,7 +584,7 @@
                     JSONObject jsonObject = JSON.parseObject(execute.getResult());
                     Integer status = jsonObject.getInteger("status");
                     if(2 == status){
-                        System.err.println("异步分账回调异常");
+                        logger.warn("异步分账回调异常");
                         return;
                     }
                     String merOrderId = jsonObject.getString("merOrderId");
@@ -602,15 +606,15 @@
                             TrhRequest<Receive> request1 = new TrhRequest();
                             InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
                             if(!"0000".equals(execute.getCode())){
-                                System.err.println("确认收货" + execute.getMsg());
+                                logger.warn("确认收货" + execute.getMsg());
                             }
                             JSONObject jsonObject = JSON.parseObject(execute.getResult());
                             String status = jsonObject.getString("status");
                             if("2".equals(status)){
-                                System.err.println("确认收货失败");
+                                logger.warn("确认收货失败");
                             }
                             if("0".equals(status)){
-                                System.err.println("确认收货处理中");
+                                logger.warn("确认收货处理中");
                             }
                         }
                     }, 15000);
@@ -621,7 +625,7 @@
                     out.close();
                 }
             } else {//验签失败业务处理逻辑
-                System.err.println("支付回调验签失败");
+                logger.warn("支付回调验签失败");
             }
         }catch (Exception e){
             e.printStackTrace();
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
index bf72cc6..2dcd65e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
@@ -24,4 +24,10 @@
      * @throws Exception
      */
     ResultUtil driverOffWork(Integer driverId, Long onlineTime) throws Exception;
+
+
+    /**
+     * 定时任务检查司机余额是否充足
+     */
+    void taskDriverOffWork();
 }
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
index 55527ce..2fb82ef 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
@@ -128,7 +128,7 @@
             Double backgroundBalance = driver.getBackgroundBalance();
             Double balance = driver.getBalance();
             double all = backgroundBalance + balance;
-            if(num1 > all){
+            if(num1.compareTo(all) > 0){
                 continue;
             }
 
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
index c15dbd5..8455413 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
@@ -61,17 +61,17 @@
         if(driver.getBalance() == null || driver.getBalance().compareTo(num1) < 0){
             return ResultUtil.error("账户余额不足，请先充值");
         }
-        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
-        JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
-        Integer num5 = jsonObject.getInteger("num5");
-        OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("oldDriverId", driverId)
-                .eq("status", 1).isNotNull("successTime").orderBy("createTime desc limit 0, 1"));
-        if(null != orderTransfer){
-            int i = Double.valueOf((System.currentTimeMillis() - orderTransfer.getSuccessTime().getTime()) / 60000).intValue();
-            if(num5 > i){
-                return ResultUtil.error("暂时还无法上班，请" + (num5 - i) + "分钟后重试");
-            }
-        }
+//        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
+//        JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+//        Integer num5 = jsonObject.getInteger("num5");
+//        OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("oldDriverId", driverId)
+//                .eq("status", 1).isNotNull("successTime").orderBy("createTime desc limit 0, 1"));
+//        if(null != orderTransfer){
+//            int i = Double.valueOf((System.currentTimeMillis() - orderTransfer.getSuccessTime().getTime()) / 60000).intValue();
+//            if(num5 > i){
+//                return ResultUtil.error("暂时还无法上班，请" + (num5 - i) + "分钟后重试");
+//            }
+//        }
 
         DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driverId).eq("status", 1));
         if(null != driverWork){
@@ -119,4 +119,20 @@
         driverService.updateById(driver);
         return ResultUtil.success();
     }
+
+
+    @Override
+    public void taskDriverOffWork() {
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+        Double num1 = JSON.parseObject(systemConfig.getContent()).getDouble("num1");
+        List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("status", 1).lt("balance", num1));
+        for (Driver driver : drivers) {
+            DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver.getId()).eq("status", 1));
+            if(null != driverWork){
+                driverWork.setStatus(2);
+                driverWork.setOffWorkTime(new Date());
+                this.updateById(driverWork);
+            }
+        }
+    }
 }
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index a87c1fc..f76f109 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -21,6 +21,8 @@
 import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
 import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
 import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -46,6 +48,8 @@
 */
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+    Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
     @Autowired
     private IDriverWorkService driverWorkService;
@@ -593,19 +597,22 @@
                     @Override
                     public void run() {
                         Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
                             driver1.setServerStatus(1);
                             driverService.updateById(driver1);
                         }
 
-                        if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+                        if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
                             driver1.setServerStatus(1);
                             driverService.updateById(driver1);
-
+                        }
+                        if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
                             order1.setHallOrder(1);
                             OrderServiceImpl.this.updateById(order1);
                             ExtraPushOrder(order);
                         }
+
+
                     }
                 }, num4 * 1000);
             }else{
@@ -650,7 +657,7 @@
         for (Driver driver1 : drivers) {
             String value = redisUtil.getValue("DRIVER" + driver1.getId());
             if (ToolUtil.isEmpty(value)) {
-                return;
+                continue;
             }
             pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
         }
@@ -960,6 +967,17 @@
                     city = null != weatherCity ? weatherCity.getId().toString() : "";
                 }
                 order = getOrderPrice(2, Double.valueOf(order.getActualMileage()) / 1000, order.getWaitTime(), order, city);
+                Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
+                if(null != coupon){
+                    order.setCouponId(coupon.getId());
+                    order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+                    order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+                    UserToCoupon userToCoupon = userToCouponService.selectById(coupon.getId());
+                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+                    userToCouponService.updateById(userToCoupon);
+                }else{
+                    order.setPayMoney(order.getOrderMoney());
+                }
 
                 //修改司机状态和积分
                 Driver driver = driverService.selectById(order.getDriverId());
@@ -1245,7 +1263,7 @@
         OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
         orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
         orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
-        orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
+        orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage()) / 1000);
         if(null != order.getStartPrice() && 0 != order.getStartPrice()){
             orderPriceWarpper.setStartPrice(order.getStartPrice());
             orderPriceWarpper.setStartDistance(order.getStartDistance());
@@ -1267,7 +1285,7 @@
         orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
         orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
         orderPriceWarpper.setPayMoney(order.getPayMoney());
-        if(order.getState() < 107){
+        if(order.getState() < 106){
             orderPriceWarpper.setPayMoney(order.getOrderMoney());
         }
         orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
@@ -1295,70 +1313,14 @@
 
         if(payType == 2 && state == 107){
             order.setPayType(3);
-            Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
-            if(null != coupon){
-                order.setCouponId(coupon.getId());
-                order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-                order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
-            }else{
-                order.setPayMoney(order.getOrderMoney());
-            }
         }
 
         if(payType == 2 && state == 108){
             order.setPayTime(new Date());
             if(null != order.getCouponId()){
                 UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
-                if(userToCoupon.getValidCount() > 0){
-                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                    userToCouponService.updateById(userToCoupon);
-                    Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+                Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
 
-                    Driver driver = driverService.selectById(order.getDriverId());
-                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
-                    accountChangeDetail.setUserType(2);
-                    accountChangeDetail.setUserId(order.getDriverId());
-                    accountChangeDetail.setCreateTime(new Date());
-                    accountChangeDetail.setOldData(driver.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);
-
-                    //补贴中分账
-                    Double discountedPrice = order.getDiscountedPrice();
-                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
-                    for (RechargeRecord rechargeRecord : rechargeRecords) {
-                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
-                        if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
-                            if(10000 == zhaunzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
-                                rechargeRecordService.updateById(rechargeRecord);
-                            }
-                            break;
-                        }else{
-                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                            if(10000 == zhaunzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(0D);
-                                rechargeRecordService.updateById(rechargeRecord);
-                                discountedPrice -= surplusDividedAmount;
-                            }else{
-                                break;
-                            }
-                        }
-                    }
-
-
-                }
-            }
-
-            if(order.getDiscountAmount() > 0){
                 Driver driver = driverService.selectById(order.getDriverId());
                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
                 accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
@@ -1369,28 +1331,30 @@
                 accountChangeDetail.setType(1);
                 accountChangeDetail.setChangeType(7);
                 accountChangeDetail.setOrderId(order.getId());
-                accountChangeDetail.setExplain("折扣优惠收入");
-                driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+                accountChangeDetail.setExplain("优惠券收入");
+                driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
                 accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
                 driverService.updateById(driver);
                 accountChangeDetailService.insert(accountChangeDetail);
 
                 //补贴中分账
-                Double discountedPrice = order.getDiscountAmount();
+                Double discountedPrice = order.getDiscountedPrice();
                 List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                 for (RechargeRecord rechargeRecord : rechargeRecords) {
                     Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                     if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+                        ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
                         if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                            Double remainAmount = zhaunzhang.getData();
+                            rechargeRecord.setSurplusDividedAmount(remainAmount);
                             rechargeRecordService.updateById(rechargeRecord);
                         }
                         break;
                     }else{
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                        ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
                         if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
+                            Double remainAmount = zhaunzhang.getData();
+                            rechargeRecord.setSurplusDividedAmount(remainAmount);
                             rechargeRecordService.updateById(rechargeRecord);
                             discountedPrice -= surplusDividedAmount;
                         }else{
@@ -1399,6 +1363,7 @@
                     }
                 }
             }
+
         }
         this.updateById(order);
 
@@ -1427,7 +1392,7 @@
      * @param notifyUrl
      * @return
      */
-    public ResultUtil zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+    public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
         Transfer transfer = new Transfer();
         transfer.setDepositMerOrderId(merOrderId);
         transfer.setToUserId(toUserId);
@@ -1439,12 +1404,13 @@
         InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
         if("0000".equals(execute.getCode())){
             JSONObject jsonObject = JSON.parseObject(execute.getResult());
-            Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
-            if(2 == status){
+            String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+            if("2" == status){
                 System.err.println("转账失败");
                 return ResultUtil.error("转账失败");
             }
-            return ResultUtil.success();
+            Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+            return ResultUtil.success(remainAmount);
         }else{
             System.err.println("转账失败：" + execute.getMsg());
             return ResultUtil.error(execute.getMsg());
@@ -1505,7 +1471,7 @@
                 accountChangeDetail1.setChangeType(9);
                 accountChangeDetail1.setOrderId(order.getId());
                 accountChangeDetail1.setOldData(driver.getBalance() + driver.getBackgroundBalance());
-                accountChangeDetail1.setExplain("线下收款服务费支出");
+                accountChangeDetail1.setExplain("订单信息费");
                 accountChangeDetail1.setCreateTime(new Date());
                 driver.setBalance(driver.getBalance() - num3);
                 accountChangeDetail1.setNewData(driver.getBalance() + driver.getBackgroundBalance());
@@ -1970,7 +1936,7 @@
             Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
             String merOrderId1 = jsonObject.getString("merOrderId");
             if(2 == status){
-                System.err.println("订单支付成功后的分账处理异常失败");
+                logger.warn("订单支付成功后的分账处理异常失败");
                 return ResultUtil.error("订单支付成功后的分账处理异常失败");
             }
             if(1 == status){
@@ -1989,9 +1955,10 @@
                 return ResultUtil.success();
             }
         }else{
-            System.err.println("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+            logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
             return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
         }
+        logger.warn("未知异常");
         return ResultUtil.error("未知异常");
     }
 
@@ -2018,9 +1985,9 @@
         if("0000".equals(execute1.getCode())){
             JSONObject jsonObject = JSON.parseObject(execute1.getResult());
             String merOrderId = jsonObject.getString("merOrderId");
-            System.err.println("分账确认收货成功");
+            logger.warn("分账确认收货成功");
         }else{
-            System.err.println("分账确认收货异常" + execute1.getMsg());
+            logger.warn("分账确认收货异常" + execute1.getMsg());
         }
     }
 
@@ -2200,54 +2167,8 @@
             order.setPayTime(new Date());
             if(null != order.getCouponId()){
                 UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
-                if(userToCoupon.getValidCount() > 0){
-                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                    userToCouponService.updateById(userToCoupon);
-                    Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+                Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
 
-                    Driver driver = driverService.selectById(order.getDriverId());
-                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
-                    accountChangeDetail.setUserType(2);
-                    accountChangeDetail.setUserId(order.getDriverId());
-                    accountChangeDetail.setCreateTime(new Date());
-                    accountChangeDetail.setOldData(driver.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);
-
-                    //补贴中分账
-                    Double discountedPrice = order.getDiscountedPrice();
-                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
-                    for (RechargeRecord rechargeRecord : rechargeRecords) {
-                        Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
-                        if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
-                            if(10000 == zhaunzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
-                                rechargeRecordService.updateById(rechargeRecord);
-                            }
-                            break;
-                        }else{
-                            ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                            if(10000 == zhaunzhang.getCode()){
-                                rechargeRecord.setSurplusDividedAmount(0D);
-                                rechargeRecordService.updateById(rechargeRecord);
-                                discountedPrice -= surplusDividedAmount;
-                            }else{
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if(order.getDiscountAmount() > 0){
                 Driver driver = driverService.selectById(order.getDriverId());
                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
                 accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
@@ -2258,28 +2179,30 @@
                 accountChangeDetail.setType(1);
                 accountChangeDetail.setChangeType(7);
                 accountChangeDetail.setOrderId(order.getId());
-                accountChangeDetail.setExplain("折扣优惠收入");
-                driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+                accountChangeDetail.setExplain("优惠券收入");
+                driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
                 accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
                 driverService.updateById(driver);
                 accountChangeDetailService.insert(accountChangeDetail);
 
                 //补贴中分账
-                Double discountedPrice = order.getDiscountAmount();
+                Double discountedPrice = order.getDiscountedPrice();
                 List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                 for (RechargeRecord rechargeRecord : rechargeRecords) {
                     Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                     if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+                        ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
                         if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                            Double remainAmount = zhaunzhang.getData();
+                            rechargeRecord.setSurplusDividedAmount(remainAmount);
                             rechargeRecordService.updateById(rechargeRecord);
                         }
                         break;
                     }else{
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                        ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
                         if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
+                            Double remainAmount = zhaunzhang.getData();
+                            rechargeRecord.setSurplusDividedAmount(remainAmount);
                             rechargeRecordService.updateById(rechargeRecord);
                             discountedPrice -= surplusDividedAmount;
                         }else{
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
index 88cdb10..b6c0c4d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
@@ -1,10 +1,7 @@
 package com.supersavedriving.driver.modular.system.util;
 
 
-import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
-import com.supersavedriving.driver.modular.system.service.IOrderService;
-import com.supersavedriving.driver.modular.system.service.IYouTuiDriverService;
+import com.supersavedriving.driver.modular.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -33,6 +30,9 @@
     @Autowired
     private RedisUtil redisUtil;
 
+    @Autowired
+    private IDriverWorkService driverWorkService;
+
 
     /**
      * 5秒推送
@@ -57,6 +57,7 @@
     @Scheduled(fixedRate = 1000 * 60)
     public void taskMinute(){
         try {
+            driverWorkService.taskDriverOffWork();
             youTuiDriverService.editState();
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
index e6ff73c..2ccf046 100644
--- a/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
+++ b/driver/guns-admin/src/test/java/com/supersavedriving/driver/GunsApplicationTest.java
@@ -1,26 +1,30 @@
 //package com.supersavedriving.driver;
 //
-//import com.alibaba.fastjson.JSON;
-//import com.baomidou.mybatisplus.mapper.EntityWrapper;
-//import com.supersavedriving.driver.modular.system.model.DriverBank;
-//import com.supersavedriving.driver.modular.system.model.Order;
-//import com.supersavedriving.driver.modular.system.model.WeatherCity;
-//import com.supersavedriving.driver.modular.system.service.*;
-//import com.supersavedriving.driver.modular.system.service.impl.OrderServiceImpl;
-//import com.supersavedriving.driver.modular.system.util.ResultUtil;
-//import com.supersavedriving.driver.modular.system.util.juhe.WeatherCityInfo;
-//import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
-//import com.supersavedriving.driver.modular.system.warpper.PerformanceSummaryWarpper;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
+//        import com.alibaba.fastjson.JSON;
+//        import com.alibaba.fastjson.JSONObject;
+//        import com.baomidou.mybatisplus.mapper.EntityWrapper;
+//        import com.supersavedriving.driver.modular.system.model.*;
+//        import com.supersavedriving.driver.modular.system.service.*;
+//        import com.supersavedriving.driver.modular.system.service.impl.OrderServiceImpl;
+//        import com.supersavedriving.driver.modular.system.util.MallBook.model.Complete;
+//        import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
+//        import com.supersavedriving.driver.modular.system.util.MallBook.model.PamentOrderUser;
+//        import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+//        import com.supersavedriving.driver.modular.system.util.ResultUtil;
+//        import com.supersavedriving.driver.modular.system.util.UUIDUtil;
+//        import com.supersavedriving.driver.modular.system.util.juhe.WeatherCityInfo;
+//        import com.supersavedriving.driver.modular.system.util.juhe.WeatherUtil;
+//        import com.supersavedriving.driver.modular.system.warpper.OrderPriceWarpper;
+//        import com.supersavedriving.driver.modular.system.warpper.PerformanceSummaryWarpper;
+//        import org.junit.Test;
+//        import org.junit.runner.RunWith;
+//        import org.springframework.beans.BeanUtils;
+//        import org.springframework.beans.factory.annotation.Autowired;
+//        import org.springframework.boot.test.context.SpringBootTest;
+//        import org.springframework.test.context.junit4.SpringRunner;
 //
-//import java.text.SimpleDateFormat;
-//import java.util.Calendar;
-//import java.util.Date;
+//        import java.text.SimpleDateFormat;
+//        import java.util.*;
 //
 //
 //@RunWith(SpringRunner.class)
@@ -36,10 +40,34 @@
 //    @Autowired
 //    private IDriverBankService driverBankService;
 //
+//    @Autowired
+//    private IAppUserService appUserService;
+//
+//    @Autowired
+//    private ISystemConfigService systemConfigService;
+//
+//    @Autowired
+//    private IAccountChangeDetailService accountChangeDetailService;
+//
+//    @Autowired
+//    private IRevenueService revenueService;
+//
+//    @Autowired
+//    private IRechargeRecordService rechargeRecordService;
+//
+//    @Autowired
+//    private IAgentService agentService;
+//
+//    @Autowired
+//    private IDivisionRecordService divisionRecordService;
+//
+//
+//
 //
 //    @Test
 //    public void test() throws Exception {
-//        Order order = orderService.selectById(1066);
-//        orderService.getOrderPrice(2, Double.valueOf(order.getActualMileage()) / 1000, order.getWaitTime(), order, null);
+//        OrderPriceWarpper orderPriceWarpper = orderService.queryOrderPrice(1, 1136L);
+//        System.err.println(orderPriceWarpper);
 //    }
+//
 //}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
index 3074beb..d1745d5 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
@@ -95,7 +95,7 @@
     @TableField(value = "cancelCount")
     private Integer cancelCount;
 
-    @ApiModelProperty(value = "是否拥有9折优惠 1是 0否")
+    @ApiModelProperty(value = "是否拥有95折优惠 1是 0否")
     @TableField(value = "havDiscount")
     private Integer havDiscount;
 
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index d17ae67..0332239 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -25,6 +25,8 @@
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
@@ -118,7 +120,7 @@
             if(1 == tAppUser.getHavDiscount()){
                 BigDecimal subtract = tOrder.getOrderMoney().subtract(tOrder.getDiscountedPrice());
                 // 计算95折优惠金额
-                BigDecimal multiply = subtract.multiply(new BigDecimal("0.05")).setScale(2);
+                BigDecimal multiply = subtract.multiply(new BigDecimal("0.05"), new MathContext(2, RoundingMode.HALF_EVEN));
                 model.addAttribute("multiply",multiply);
             }else {
                 model.addAttribute("multiply",0);
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 43c629a..d9ab0f3 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
@@ -18,6 +18,8 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +37,8 @@
 @RestController
 @RequestMapping("")
 public class OrderController {
+
+    Logger logger = LoggerFactory.getLogger(OrderController.class);
 
     @Autowired
     private IOrderService orderService;
@@ -410,7 +414,7 @@
                 JSONObject jsonObject = JSON.parseObject(execute.getResult());
                 Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
                 if(2 == status){
-                    System.err.println("转账失败");
+                    logger.warn("转账失败");
                     return;
                 }
                 String parameter1 = jsonObject.getString("parameter1");
@@ -423,7 +427,7 @@
                 out.flush();
                 out.close();
             }else{
-                System.err.println("转账失败：" + execute.getMsg());
+                logger.warn("转账失败：" + execute.getMsg());
                 return;
             }
         }catch (Exception e){
@@ -447,7 +451,7 @@
                     JSONObject jsonObject = JSON.parseObject(execute.getResult());
                     Integer status = jsonObject.getInteger("status");
                     if(2 == status){
-                        System.err.println("异步分账回调异常");
+                        logger.warn("异步分账回调异常");
                         return;
                     }
                     String merOrderId = jsonObject.getString("merOrderId");
@@ -469,15 +473,15 @@
                             TrhRequest<Receive> request1 = new TrhRequest();
                             InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
                             if(!"0000".equals(execute.getCode())){
-                                System.err.println("确认收货" + execute.getMsg());
+                                logger.warn("确认收货" + execute.getMsg());
                             }
                             JSONObject jsonObject = JSON.parseObject(execute.getResult());
                             String status = jsonObject.getString("status");
                             if("2".equals(status)){
-                                System.err.println("确认收货失败");
+                                logger.warn("确认收货失败");
                             }
                             if("0".equals(status)){
-                                System.err.println("确认收货处理中");
+                                logger.warn("确认收货处理中");
                             }
                         }
                     }, 15000);
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
index fdb46b3..738c5f1 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
@@ -106,7 +106,7 @@
     @TableField("cancelCount")
     private Integer cancelCount;
     /**
-     * 是否拥有9折优惠 1是 0否
+     * 是否拥有9.5折优惠 1是 0否
      */
     @TableField("havDiscount")
     private Integer havDiscount;
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 e371ad1..16448d2 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
@@ -455,8 +455,13 @@
                                     accountChangeDetail.setOldData(appUser1.getAccountBalance());
                                     appUser1.setAccountBalance(appUser1.getAccountBalance() + rechargeRecord1.getAmount());
                                     accountChangeDetail.setNewData(appUser1.getAccountBalance());
-                                    AppUserServiceImpl.this.updateById(appUser1);
                                     accountChangeDetailService.saveData(accountChangeDetail);
+                                    SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+                                    Double num2 = JSON.parseObject(systemConfig.getContent()).getDouble("num2");
+                                    if(appUser1.getHavDiscount() == 0 && rechargeRecord1.getAmount().compareTo(num2) >= 0){
+                                        appUser1.setHavDiscount(1);
+                                    }
+                                    AppUserServiceImpl.this.updateById(appUser1);
 
                                     rechargeRecord1.setPayTime(new Date());
                                     rechargeRecord1.setPayStatus(2);
@@ -509,8 +514,13 @@
         accountChangeDetail.setOldData(appUser.getAccountBalance());
         appUser.setAccountBalance(appUser.getAccountBalance() + rechargeRecord1.getAmount());
         accountChangeDetail.setNewData(appUser.getAccountBalance());
-        this.updateById(appUser);
         accountChangeDetailService.saveData(accountChangeDetail);
+        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+        Double num2 = JSON.parseObject(systemConfig.getContent()).getDouble("num2");
+        if(appUser.getHavDiscount() == 0 && rechargeRecord1.getAmount().compareTo(num2) >= 0){
+            appUser.setHavDiscount(1);
+        }
+        this.updateById(appUser);
 
         rechargeRecord1.setPayTime(new Date());
         rechargeRecord1.setPayStatus(2);
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 a3c0648..5ce9591 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
@@ -19,6 +19,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,6 +49,8 @@
 */
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+    Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
     @Autowired
     private ISystemConfigService systemConfigService;
@@ -670,15 +674,16 @@
                     @Override
                     public void run() {
                         Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
                             driver1.setServerStatus(1);
                             driverService.updateById(driver1);
                         }
 
-                        if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+                        if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
                             driver1.setServerStatus(1);
                             driverService.updateById(driver1);
-
+                        }
+                        if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
                             order1.setHallOrder(1);
                             OrderServiceImpl.this.updateById(order1);
                             ExtraPushOrder(order);
@@ -728,7 +733,7 @@
         for (Driver driver1 : drivers) {
             String value = redisUtil.getValue("DRIVER" + driver1.getId());
             if (ToolUtil.isEmpty(value)) {
-                return;
+                continue;
             }
             pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
         }
@@ -869,7 +874,7 @@
         OrderPriceInfoWarpper orderPriceWarpper = new OrderPriceInfoWarpper();
         orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
         orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
-        orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+        orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage()) / 1000);
         if(null != order.getStartPrice() && 0 != order.getStartPrice()){
             orderPriceWarpper.setStartPrice(order.getStartPrice());
             orderPriceWarpper.setStartDistance(order.getStartDistance());
@@ -890,7 +895,8 @@
         orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
         orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
         orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
-        if(null == order.getPayMoney()){
+        orderPriceWarpper.setPayMoney(order.getPayMoney());
+        if(order.getState() < 107){
             orderPriceWarpper.setPayMoney(order.getOrderMoney());
         }
         return orderPriceWarpper;
@@ -1014,21 +1020,8 @@
      * @throws Exception
      */
     public ResultUtil weixinPay(Order order, AppUser appUser, Integer couponId) throws Exception{
-        Double payMoney = order.getOrderMoney();
-        if(null != couponId){
-            UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
-            if(userToCoupon.getValidCount() > 0){
-                userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                userToCouponService.updateById(userToCoupon);
-                Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
-                payMoney = payMoney - coupon.getCouponPreferentialAmount();
-                order.setCouponId(coupon.getId());
-                order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-                userToCouponService.updateById(userToCoupon);
-            }
-        }
+        Double payMoney = order.getPayMoney();
         order.setPayType(1);
-        order.setPayMoney(payMoney);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         String out_trade_no = sdf.format(new Date()) + order.getId();
 
@@ -1123,19 +1116,7 @@
      * @return
      */
     public ResultUtil balancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
-        Double payMoney = order.getOrderMoney();
-        if(null != couponId){
-            UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
-            if(userToCoupon.getValidCount() > 0){
-                userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                userToCouponService.updateById(userToCoupon);
-                Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
-                payMoney = payMoney - coupon.getCouponPreferentialAmount();
-                order.setCouponId(coupon.getId());
-                order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-            }
-        }
-
+        Double payMoney = order.getPayMoney();
         if(appUser.getHavDiscount() == 1){//9.5折
             order.setDiscount(9.5D);
             order.setDiscountAmount(payMoney * 0.05);
@@ -1187,27 +1168,8 @@
      * @throws Exception
      */
     public ResultUtil weixinAndBalancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
-        Double payMoney = order.getOrderMoney();
-        if(null != couponId){
-            UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
-            if(userToCoupon.getValidCount() > 0){
-                userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                userToCouponService.updateById(userToCoupon);
-                Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
-                payMoney = payMoney - coupon.getCouponPreferentialAmount();
-                order.setCouponId(coupon.getId());
-                order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-            }
-        }
-
+        Double payMoney = order.getPayMoney();
         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;
 
         AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
         accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
@@ -1223,6 +1185,12 @@
         accountChangeDetail.setNewData(appUser.getAccountBalance());
         appUserService.updateById(appUser);
         accountChangeDetailService.insert(accountChangeDetail);
+
+        order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);
+        payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
+        order.setWeChatPayment(payMoney);
+        order.setResidueBalancePayment(order.getBalancePayment());
+        order.setResidueWeChatPayment(order.getWeChatPayment());
 
         if(0 < payMoney){//还需要调起微信支付
             order.setPayType(4);
@@ -1317,7 +1285,6 @@
             return ResultUtil.success(payCode);
         }else{
             order.setPayType(2);
-            order.setPayMoney(payMoney);
             order.setPayTime(new Date());
             order.setState(108);
             this.updateById(order);
@@ -1452,300 +1419,8 @@
      * @throws Exception
      */
     public void saveCommissionWX(Order order) throws Exception{
+        saveGiveaway(order);//处理分佣
         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);
-
-                            //订单分账
-                            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);
@@ -1795,16 +1470,18 @@
             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");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                     }
                     break;
                 }else{
-                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(0D);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                         discountedPrice -= surplusDividedAmount;
                     }else{
@@ -1813,58 +1490,15 @@
                 }
             }
 
-        }
-        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{
-        //司机收入和代理商抽成(先分佣，后抽成)
-        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+    public void saveGiveaway(Order order) throws Exception{
         Driver driver = driverService.selectById(order.getDriverId());
         AppUser appUser = appUserService.selectById(order.getUserId());
 
@@ -1902,6 +1536,20 @@
             Double num2 = jsonObject.getDouble("num2");
             Double num3 = jsonObject.getDouble("num3");
             if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+                AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+                accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail1.setUserType(2);
+                accountChangeDetail1.setUserId(driver.getId());
+                accountChangeDetail1.setType(1);
+                accountChangeDetail1.setChangeType(9);
+                accountChangeDetail1.setOrderId(order.getId());
+                accountChangeDetail1.setOldData(driver.getBalance() + driver.getBackgroundBalance());
+                accountChangeDetail1.setExplain("订单信息费");
+                accountChangeDetail1.setCreateTime(new Date());
+                driver.setBalance(driver.getBalance() - num3);
+                accountChangeDetail1.setNewData(driver.getBalance() + driver.getBackgroundBalance());
+                driverService.updateById(driver);
+                accountChangeDetailService.saveData(accountChangeDetail1);
 
                 SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
                 if(null != systemConfig1){
@@ -1936,9 +1584,9 @@
                             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"));
+                            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                             for (RechargeRecord rechargeRecord : rechargeRecords) {
                                 Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                 if(surplusDividedAmount.compareTo(num1_1) >= 0){
@@ -1998,9 +1646,9 @@
                                     driverService.updateById(driver1);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
-                                    //用户充值记录分账
+                                    //司机充值记录分账
                                     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"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                     for (RechargeRecord rechargeRecord : rechargeRecords) {
                                         Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                         if(surplusDividedAmount.compareTo(num5_1) >= 0){
@@ -2049,9 +1697,9 @@
                                     driverService.updateById(driver2);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
-                                    //用户充值记录分账
+                                    //司机充值记录分账
                                     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"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                     for (RechargeRecord rechargeRecord : rechargeRecords) {
                                         Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                         if(surplusDividedAmount.compareTo(num6_1) >= 0){
@@ -2099,9 +1747,9 @@
                                     driverService.updateById(driver3);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
-                                    //用户充值记录分账
+                                    //司机充值记录分账
                                     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"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                     for (RechargeRecord rechargeRecord : rechargeRecords) {
                                         Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                         if(surplusDividedAmount.compareTo(num7_1) >= 0){
@@ -2153,9 +1801,9 @@
                                     driverService.updateById(driver1);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
-                                    //用户充值记录分账
+                                    //司机充值记录分账
                                     Double num3_1 = num3_;
-                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                     for (RechargeRecord rechargeRecord : rechargeRecords) {
                                         Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                         if(surplusDividedAmount.compareTo(num3_1) >= 0){
@@ -2204,9 +1852,9 @@
                                     driverService.updateById(driver2);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
-                                    //用户充值记录分账
+                                    //司机充值记录分账
                                     Double num4_1 = num4;
-                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                    List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                     for (RechargeRecord rechargeRecord : rechargeRecords) {
                                         Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                         if(surplusDividedAmount.compareTo(num4_1) >= 0){
@@ -2258,9 +1906,9 @@
                                 driverService.updateById(driver1);
                                 accountChangeDetailService.saveData(accountChangeDetail);
 
-                                //用户充值记录分账
+                                //司机充值记录分账
                                 Double num2_1 = num2_;
-                                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                                 for (RechargeRecord rechargeRecord : rechargeRecords) {
                                     Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                                     if(surplusDividedAmount.compareTo(num2_1) >= 0){
@@ -2298,9 +1946,9 @@
                         revenueService.insert(revenue);
 
                         Agent agent = agentService.selectById(driver.getAgentId());
-                        //用户充值记录分账
+                        //司机充值记录分账
                         Double num3_1 = num3;
-                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+                        List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
                         for (RechargeRecord rechargeRecord : rechargeRecords) {
                             Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
                             if(surplusDividedAmount.compareTo(num3_1) >= 0){
@@ -2325,8 +1973,20 @@
                 }
             }
         }
+    }
 
-        driver = driverService.selectById(order.getDriverId());
+
+
+
+    /**
+     * 余额支付分账
+     * @param order
+     * @throws Exception
+     */
+    public void saveCommissionYE(Order order) throws Exception{
+        saveGiveaway(order);//分佣
+        Driver driver = driverService.selectById(order.getDriverId());
+        AppUser appUser = appUserService.selectById(order.getUserId());
         //司机订单收入
         Revenue revenue = new Revenue();
         revenue.setType(1);
@@ -2399,16 +2059,18 @@
             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");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                     }
                     break;
                 }else{
-                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(0D);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                         discountedPrice -= surplusDividedAmount;
                     }else{
@@ -2418,45 +2080,46 @@
             }
 
         }
-        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;
-                    }
-                }
-            }
-        }
+        // TODO: 2023/6/25 折扣优惠由司机承担
+//        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;
+//                    }
+//                }
+//            }
+//        }
     }
 
 
@@ -2466,629 +2129,9 @@
      * @throws Exception
      */
     public void saveCommissionWXANDYU(Order order) throws Exception{
-        //司机收入和代理商抽成(先分佣，后抽成)
-        //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+        saveGiveaway(order);//分佣
         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);
@@ -3180,16 +2223,18 @@
             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");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                     }
                     break;
                 }else{
-                    ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
                     if(10000 == zhaunzhang.getCode()){
-                        rechargeRecord.setSurplusDividedAmount(0D);
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
                         rechargeRecordService.updateById(rechargeRecord);
                         discountedPrice -= surplusDividedAmount;
                     }else{
@@ -3198,45 +2243,6 @@
                 }
             }
 
-        }
-        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"));
-            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;
-                    }
-                }
-            }
         }
     }
 
@@ -3278,7 +2284,7 @@
             Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
             String merOrderId1 = jsonObject.getString("merOrderId");
             if(2 == status){
-                System.err.println("订单支付成功后的分账处理异常失败");
+                logger.warn("订单支付成功后的分账处理异常失败");
                 return ResultUtil.error("订单支付成功后的分账处理异常失败");
             }
             if(1 == status){
@@ -3297,9 +2303,10 @@
                 return ResultUtil.success();
             }
         }else{
-            System.err.println("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+            logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
             return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
         }
+        logger.warn("未知异常");
         return ResultUtil.error("未知异常");
     }
 
@@ -3326,9 +2333,9 @@
         if("0000".equals(execute1.getCode())){
             JSONObject jsonObject = JSON.parseObject(execute1.getResult());
             String merOrderId = jsonObject.getString("merOrderId");
-            System.err.println("分账确认收货成功");
+            logger.warn("分账确认收货成功");
         }else{
-            System.err.println("分账确认收货异常" + execute1.getMsg());
+            logger.warn("分账确认收货异常" + execute1.getMsg());
         }
     }
 
@@ -3342,7 +2349,7 @@
      * @param notifyUrl
      * @return
      */
-    public ResultUtil zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+    public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
         Transfer transfer = new Transfer();
         transfer.setDepositMerOrderId(merOrderId);
         transfer.setToUserId(toUserId);
@@ -3354,12 +2361,13 @@
         InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
         if("0000".equals(execute.getCode())){
             JSONObject jsonObject = JSON.parseObject(execute.getResult());
-            Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
-            if(2 == status){
+            String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+            if("2" == status){
                 System.err.println("转账失败");
                 return ResultUtil.error("转账失败");
             }
-            return ResultUtil.success();
+            Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+            return ResultUtil.success(remainAmount);
         }else{
             System.err.println("转账失败：" + execute.getMsg());
             return ResultUtil.error(execute.getMsg());

--
Gitblit v1.7.1