From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志

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

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index ed9b1de..53c5e88 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;
@@ -34,7 +36,6 @@
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.MathContext;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -47,6 +48,8 @@
 */
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+    Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
     @Autowired
     private IDriverWorkService driverWorkService;
@@ -108,10 +111,11 @@
     @Autowired
     private IAgentService agentService;
 
+    @Autowired
+    private IOrderPositionService orderPositionService;
+
     @Value("${callbackPath}")
     private String callbackPath;//支付回调网关地址
-
-    private Map<String, Timer> timerMap = new HashMap<>();
 
 
 
@@ -162,13 +166,26 @@
             driver.setServerStatus(2);
             order.setOrderTakingTime(new Date());
         }
-        order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+        order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
         order.setSource(2);
 
         AppUser appUser = appUserService.selectOne(new EntityWrapper<AppUser>().eq("phone", addOrderWarpper.getPhone()).eq("status", 1));
         if(null != appUser){
             order.setUserId(appUser.getId());
         }
+
+
+        String startAddress = addOrderWarpper.getStartAddress();
+        startAddress = startAddress.replaceAll("& #40;", "(");
+        startAddress = startAddress.replaceAll("& #41;", ")");
+        addOrderWarpper.setStartAddress(startAddress);
+        if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
+            String endAddress = addOrderWarpper.getEndAddress();
+            endAddress = endAddress.replaceAll("& #40;", "(");
+            endAddress = endAddress.replaceAll("& #41;", ")");
+            addOrderWarpper.setEndAddress(endAddress);
+        }
+
         order.setUserName(addOrderWarpper.getUserName());
         order.setUserPhone(addOrderWarpper.getPhone());
         order.setAgentId(driver.getAgentId());
@@ -204,6 +221,8 @@
         driverService.updateById(driver);
         //推送状态
         if(null != order.getDriverId()){
+            //推动订单数据
+            redisUtil.addSetValue("orderService", order.getId().toString());
             pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
         }else{
             //开始推单
@@ -228,9 +247,7 @@
      * @param city          查询天气的城市
      * @return
      */
-    public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
-        distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
-        waitTime = new BigDecimal(waitTime).setScale(0, BigDecimal.ROUND_UP).intValue();
+    public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city) throws Exception{
         order = getOrderInitialPrice(order);
         SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
         if(null == systemConfig){
@@ -269,7 +286,7 @@
             s.setTime(date);
             s.set(Calendar.HOUR_OF_DAY, hour1);
             s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
-            s.set(Calendar.SECOND, 0);
+            s.set(Calendar.SECOND, 59);
 
             Calendar e = Calendar.getInstance();
             e.setTime(date);
@@ -290,12 +307,14 @@
                     order.setStartDistance(distance);//起步里程
                     order.setStartPrice(num4);//起步价
                 }else{
-                    BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3)).setScale(2, BigDecimal.ROUND_HALF_EVEN);//超出起步里程
-                    BigDecimal divide = subtract.divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
-                    BigDecimal multiply = divide.multiply(new BigDecimal(num6));
+                    Double distance1 = distance;//原始里程
                     order.setStartDistance(num3);//起步里程
                     order.setStartPrice(num4);//起步价
-                    order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
+                    order.setOverDriveDistance(new BigDecimal(distance1 - num3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出起步里程
+
+                    distance = new BigDecimal(distance).setScale(0, RoundingMode.UP).doubleValue();//向上取整
+                    BigDecimal divide = new BigDecimal(distance - num3).divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
+                    BigDecimal multiply = divide.multiply(new BigDecimal(num6));
                     order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
 
                     //计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
@@ -310,10 +329,10 @@
                     }
                     //计算长途里程超出的部分
                     if(distance.compareTo(num8) > 0){
-                        BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
-                        BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
+                        order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
+
+                        BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
                         BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
-                        order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
                         order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
                     }
                 }
@@ -334,13 +353,16 @@
 
         //等待费用
         if(waitTime.compareTo(num1 * 60) >= 0){
-            order.setWaitTime(num1);//等待时长
+            order.setWaitTime(num1 * 60);//等待时长
             order.setWaitTimePrice(num2);//等待费用
 
-            Integer w = waitTime - (num3 * 60);
+            Integer w = waitTime - (num1 * 60);
             BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
             order.setOutWaitTime(w);//等待时长超出分钟
             order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
+        }else{
+            order.setWaitTime(waitTime);//等待时长
+            order.setWaitTimePrice(num2);//等待费用
         }
 
         //恶劣天气
@@ -426,7 +448,6 @@
 
     /**
      * 订单推送逻辑
-     * @param order
      */
     public void pushOrder(Long orderId){
         try {
@@ -438,12 +459,12 @@
              *        合适司：积分 > 评分 > 距离
              *      3.司机没有接单直接将订单置入大厅
              */
-            boolean lock = redisUtil.lock(5);
+            boolean lock = redisUtil.lock(orderId.toString(), 5);
             if(!lock){
                 int num1 = 1;
                 while (num1 <= 10){
                     Thread.sleep(3000);//等待3秒
-                    lock = redisUtil.lock(5);
+                    lock = redisUtil.lock(orderId.toString(),5);
                     if(lock){
                         break;
                     }else{
@@ -455,11 +476,12 @@
                 order.setHallOrder(1);
                 this.updateById(order);
                 ExtraPushOrder(order);
-                redisUtil.unlock();
+                redisUtil.unlock(orderId.toString());
+                return;
             }
             SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
             if(null == systemConfig){
-                redisUtil.unlock();
+                redisUtil.unlock(orderId.toString());
                 return;
             }
             JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
@@ -492,7 +514,8 @@
                         continue;
                     }
                     Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
-                    if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
+                    int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+                    if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1 || count > 0){
                         continue;
                     }
                     DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
@@ -548,7 +571,10 @@
                             if(null == driverWork){
                                 continue;
                             }
-
+                            int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", driver1.getId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+                            if(count > 0){
+                                continue;
+                            }
                             if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
                                 integral = driver1.getIntegral();
                                 score = driver1.getScore();
@@ -594,15 +620,23 @@
                 new Timer().schedule(new TimerTask() {
                     @Override
                     public void run() {
-                        driver1.setServerStatus(1);
-                        driverService.updateById(driver1);
-
                         Order order1 = OrderServiceImpl.this.selectById(order.getId());
-                        if(order1.getState() == 101 || order1.getState() == 201){
+                        if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+                            driver1.setServerStatus(1);
+                            driverService.updateById(driver1);
+                        }
+
+                        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{
@@ -610,10 +644,10 @@
                 this.updateById(order);
                 ExtraPushOrder(order);
             }
-            redisUtil.unlock();
+            redisUtil.unlock(orderId.toString());
         }catch (Exception e){
             e.printStackTrace();
-            redisUtil.unlock();
+            redisUtil.unlock(orderId.toString());
         }
     }
 
@@ -647,7 +681,7 @@
         for (Driver driver1 : drivers) {
             String value = redisUtil.getValue("DRIVER" + driver1.getId());
             if (ToolUtil.isEmpty(value)) {
-                return;
+                continue;
             }
             pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
         }
@@ -670,6 +704,7 @@
         pageNum = (pageNum - 1) * pageSize;
         String value = redisUtil.getValue("DRIVER" + uid);
         List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
+        List<HallOrderList> lists = new ArrayList<>();
         hallOrderLists.forEach(hallOrderList -> {
             if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
                 hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
@@ -679,11 +714,17 @@
                 Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
                 Double wgs84 = distance.get("WGS84");
                 hallOrderList.setCurrentDistance(wgs84);
+
+                if(wgs84 > 5000){
+                    return;
+                }
             }else{
                 hallOrderList.setCurrentDistance(0D);
+                return;
             }
+            lists.add(hallOrderList);
         });
-        return hallOrderLists;
+        return lists;
     }
 
 
@@ -722,7 +763,7 @@
             Integer num10 = JSON.parseObject(systemConfig.getContent()).getInteger("num10");
             if (num10 > 0) {
                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                 accountChangeDetail.setUserType(2);
                 accountChangeDetail.setUserId(uid);
                 accountChangeDetail.setType(2);
@@ -759,12 +800,12 @@
             if(count > 0){
                 return ResultUtil.error("还有未完成的订单");
             }
-            boolean lock = redisUtil.lock(5);
+            boolean lock = redisUtil.lock(orderId.toString(), 5);
             if(!lock){
                 int num1 = 1;
                 while (num1 <= 10){
                     Thread.sleep(3000);//等待3秒
-                    lock = redisUtil.lock(5);
+                    lock = redisUtil.lock(orderId.toString(),5);
                     if(lock){
                         break;
                     }else{
@@ -773,17 +814,18 @@
                 }
             }
             if(!lock){
+                redisUtil.unlock(orderId.toString());
                 return ResultUtil.error("请重试");
             }
             Order order = this.selectById(orderId);
             Integer state = order.getState();
             Integer oldDriverId = order.getDriverId();
             if(state == 301){
-                redisUtil.unlock();
+                redisUtil.unlock(orderId.toString());
                 return ResultUtil.error("订单已被取消");
             }
             if(state != 101 && state != 201){
-                redisUtil.unlock();
+                redisUtil.unlock(orderId.toString());
                 return ResultUtil.error("手速慢了哦");
             }
             order.setDriverId(uid);
@@ -792,7 +834,7 @@
             order.setState(102);
             order.setOrderTakingTime(new Date());
             this.updateById(order);
-            redisUtil.unlock();
+            redisUtil.unlock(orderId.toString());
 
             if(null != order.getUserId()){
                 AppUser appUser = appUserService.selectById(order.getUserId());
@@ -805,11 +847,7 @@
             driverService.updateById(driver);
             if(state == 201){//转单的订单
                 //停止定时任务
-                Timer timer = timerMap.get(order.getId().toString());
-                if(null != timer){
-                    timer.cancel();
-                    timerMap.remove(order.getId().toString());
-                }
+                redisUtil.delSetValue("orderService", order.getId().toString());
                 //原司机下班 TODO 2023-06-21 客户说取消此功能
                 Driver oldDriver = driverService.selectById(oldDriverId);
                 oldDriver.setServerStatus(1);
@@ -836,13 +874,14 @@
                     orderTransfer.setSuccessTime(new Date());
                     orderTransferService.insert(orderTransfer);
                 }
-
-                pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
                 pushUtil.pushTransferSuccessful(oldDriverId, 2, order.getId());
+                if(null != order.getUserId()){
+                    pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
+                }
             }
 
             //推动订单数据
-            pushOrderInfo(order.getId(), uid);//开始推送订单数据
+            redisUtil.addSetValue("orderService", order.getId().toString());
             //发送系统消息
             systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单，请尽快联系客户！");
             pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
@@ -851,12 +890,15 @@
                 pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
             }
         }catch (Exception e){
-            redisUtil.unlock();
+            redisUtil.unlock(orderId.toString());
             e.printStackTrace();
             throw e;
         }
         return ResultUtil.success();
     }
+
+
+
 
 
     /**
@@ -867,7 +909,18 @@
      */
     @Override
     public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
+        Order order = this.selectById(orderId);
         OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+        Integer wait = Integer.valueOf(orderInfoWarpper.getWaitTime());
+        if(null != order.getStartWaitTime()){
+            wait += Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+        }
+        Integer s = wait % 60;
+        int m = Double.valueOf(wait / 60).intValue();
+        orderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+        Double actualMileage = orderInfoWarpper.getActualMileage();
+        orderInfoWarpper.setActualMileage(new BigDecimal(actualMileage / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+
         if(orderInfoWarpper.getTravelTime() == null){
             orderInfoWarpper.setTravelTime(0);
         }
@@ -886,6 +939,7 @@
             Map<String, String> distance1 = MapUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value, 0);
             orderInfoWarpper.setPickUpTime(Integer.valueOf(distance1.get("duration")) / 60);
         }
+        orderInfoWarpper.setDriverId(order.getDriverId());
         return orderInfoWarpper;
     }
 
@@ -930,10 +984,17 @@
                 Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
                 order.setWaitTime(order.getWaitTime() + w);
                 order.setStartWaitTime(null);
+                orderPositionService.initMap(order.getId());
                 break;
             case 106:
                 order.setGetoffTime(new Date());
                 if(ToolUtil.isEmpty(order.getEndAddress())){
+
+                    String endAddress = processOperationsWarpper.getEndAddress();
+                    endAddress = endAddress.replaceAll("& #40;", "(");
+                    endAddress = endAddress.replaceAll("& #41;", ")");
+                    processOperationsWarpper.setEndAddress(endAddress);
+
                     order.setEndAddress(processOperationsWarpper.getEndAddress());
                     order.setEndLng(processOperationsWarpper.getEndLng());
                     order.setEndLat(processOperationsWarpper.getEndLat());
@@ -946,13 +1007,26 @@
                             .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
                     city = null != weatherCity ? weatherCity.getId().toString() : "";
                 }
-                order = getOrderPrice(2, Double.valueOf(order.getActualMileage() / 1000), order.getWaitTime(), order, city);
+                try {
+                    order = getOrderPrice(2, Double.valueOf(order.getActualMileage()) / 1000, order.getWaitTime(), order, city);
+                }catch (Exception e){
+                    e.printStackTrace();
+                    return ResultUtil.error("计算费用异常");
+                }
+                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());
-                driver.setServerStatus(1);
-                driverService.updateById(driver);
                 saveIntegral(order);
+                redisUtil.delSetValue("orderService", order.getId().toString());
                 break;
             case 401:
                 order.setStartWaitTime(new Date());
@@ -986,7 +1060,7 @@
             Integer num5 = JSON.parseObject(systemConfig.getContent()).getInteger("num5");
             if(num5 > 0){
                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                 accountChangeDetail.setUserType(2);
                 accountChangeDetail.setUserId(order.getDriverId());
                 accountChangeDetail.setType(2);
@@ -1011,7 +1085,7 @@
                 Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
                 if(num8 > 0){
                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                     accountChangeDetail.setUserType(2);
                     accountChangeDetail.setUserId(order.getDriverId());
                     accountChangeDetail.setType(2);
@@ -1031,58 +1105,45 @@
     /**
      * 定时任务推送订单数据
      * @param orderId
-     * @param uid
      */
-    public void pushOrderInfo(Long orderId, Integer uid){
-        Timer timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                String value = redisUtil.getValue("DRIVER" + uid);
-                Order order = OrderServiceImpl.this.selectById(orderId);
-                if(order.getState() == 106 || order.getState() == 301){
-                    Timer timer = timerMap.get(order.getId().toString());
-                    if(null != timer){
-                        timer.cancel();
-                        timerMap.remove(order.getId().toString());
-                    }
-                }
+    @Override
+    public void pushOrderInfo(Long orderId){
+        Order order = this.selectById(orderId);
+        Integer driverId = order.getDriverId();
+        String value = redisUtil.getValue("DRIVER" + driverId);
+        if(order.getState() == 106 || order.getState() == 301){
+            redisUtil.delSetValue("orderService", orderId.toString());
+            return;
+        }
 
-                PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
-                pushOrderInfoWarpper.setId(orderId);
-                if(ToolUtil.isNotEmpty(value)){
-                    String[] split = value.split(",");
-                    pushOrderInfoWarpper.setDriverLat(split[1]);
-                    pushOrderInfoWarpper.setDriverLng(split[0]);
-                }
-                Integer w = 0;
-                if(null != order.getStartWaitTime()){
-                    w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
-                }
-                Integer wait = order.getWaitTime() + w;
-                Integer s = wait % 60;
-                pushOrderInfoWarpper.setWaitTime(Double.valueOf(wait / 60).intValue() + "." + s);
-                pushOrderInfoWarpper.setState(order.getState());
-                pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
-                pushOrderInfoWarpper.setTravelTime("0");
-                if(null != order.getStartTime()){
-                    int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 1000).intValue();
-                    Integer ss = travelTime % 60;
-                    pushOrderInfoWarpper.setTravelTime(Double.valueOf(travelTime / 60).intValue() + "." + ss);
-                }
-                if(null != order.getUserId()){
-                    pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
-                }
-                if(order.getState() == 301){//司机取消不推送给司机
-                    CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
-                    if(null != cancelOrder && cancelOrder.getUserType() == 2){
-                        return;
-                    }
-                }
-                pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
+        PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+        pushOrderInfoWarpper.setId(orderId);
+        if(ToolUtil.isNotEmpty(value)){
+            String[] split = value.split(",");
+            pushOrderInfoWarpper.setDriverLat(split[1]);
+            pushOrderInfoWarpper.setDriverLng(split[0]);
+        }
+        Integer w = 0;
+        if(null != order.getStartWaitTime()){
+            w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+        }
+        Integer wait = order.getWaitTime() + w;
+        Integer s = wait % 60;
+        Integer m = wait / 60;
+        pushOrderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+        pushOrderInfoWarpper.setState(order.getState());
+        pushOrderInfoWarpper.setActualMileage(new BigDecimal(order.getActualMileage()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue());
+        pushOrderInfoWarpper.setTravelTime("0");
+        if(null != order.getUserId()){
+            pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
+        }
+        if(order.getState() == 301){//司机取消不推送给司机
+            CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
+            if(null != cancelOrder && cancelOrder.getUserType() == 2){
+                return;
             }
-        },0, 5000);
-        timerMap.put(orderId.toString(), timer);
+        }
+        pushUtil.pushOrderInfo(driverId, 2, pushOrderInfoWarpper);
     }
 
 
@@ -1137,6 +1198,12 @@
     @Override
     public ResultUtil setOrderEndAddress(Integer uid, OrderEndAddressWarpper orderEndAddressWarpper) throws Exception {
         Order order = this.selectById(orderEndAddressWarpper.getOrderId());
+
+        String endAddress = orderEndAddressWarpper.getEndAddress();
+        endAddress = endAddress.replaceAll("& #40;", "(");
+        endAddress = endAddress.replaceAll("& #41;", ")");
+        orderEndAddressWarpper.setEndAddress(endAddress);
+
         order.setEndLat(orderEndAddressWarpper.getEndLat());
         order.setEndLng(orderEndAddressWarpper.getEndLng());
         order.setEndAddress(orderEndAddressWarpper.getEndAddress());
@@ -1198,6 +1265,9 @@
     @Override
     public ResultUtil driverCancelOrder(Integer uid, Long orderId, String cause) throws Exception {
         Order order = this.selectById(orderId);
+        if(null == order){
+            return ResultUtil.error("订单数据异常");
+        }
         if(uid.compareTo(order.getDriverId()) != 0){
             return ResultUtil.error("无法取消订单");
         }
@@ -1207,6 +1277,7 @@
 
         order.setState(301);
         this.updateById(order);
+        redisUtil.delSetValue("orderService", orderId.toString());
 
         CancelOrder cancelOrder = new CancelOrder();
         cancelOrder.setOrderId(orderId);
@@ -1222,7 +1293,9 @@
             driverService.updateById(driver);
         }
 
-        pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+        if(null != order.getUserId()){
+            pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+        }
         return ResultUtil.success();
     }
 
@@ -1241,28 +1314,31 @@
         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());
             orderPriceWarpper.setOverDriveDistance(order.getOverDriveDistance());
             orderPriceWarpper.setMileageFee(order.getOverDrivePrice());
         }else{
-            String[] split = order.getLongDistance().split("-");
-            orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
-            orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
-            orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
-            orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
+            if(order.getLongDistance().indexOf("-") >= 0){
+                String[] split = order.getLongDistance().split("-");
+                orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+                orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+                orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+                orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
+            }
         }
         Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
         Integer s = waitTime % 60;
-        orderPriceWarpper.setWaitTime(Double.valueOf(waitTime / 60).intValue() + "." + s);
+        Integer m = waitTime / 60;
+        orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
         orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
         orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
         orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
         orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
         orderPriceWarpper.setPayMoney(order.getPayMoney());
-        if(order.getState() < 107){
+        if(order.getState() < 106){
             orderPriceWarpper.setPayMoney(order.getOrderMoney());
         }
         orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
@@ -1281,47 +1357,60 @@
      */
     @Override
     public ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception {
-        List<Integer> s = Arrays.asList(107, 108);
-        if(!s.contains(state)){
-            return ResultUtil.error("操作失败，请刷新订单");
-        }
-        Order order = this.selectById(orderId);
-        order.setState(state);
-
-        if(payType == 2 && state == 107){
-            order.setPayType(3);
-            Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
-            if(null != coupon){
-                order.setCouponId(coupon.getId());
-                order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-                order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
-            }else{
-                order.setPayMoney(order.getOrderMoney());
+        try {
+            boolean lock = redisUtil.lock(orderId + "",5);
+            if(!lock){
+                int num1 = 1;
+                while (num1 <= 10){
+                    Thread.sleep(3000);//等待3秒
+                    lock = redisUtil.lock(orderId + "",5);
+                    if(lock){
+                        break;
+                    }else{
+                        num1++;
+                    }
+                }
             }
-        }
+            if(!lock){
+                redisUtil.unlock(orderId + "");
+                return ResultUtil.error("请稍后重试");
+            }
 
-        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);
+            Order order = this.selectById(orderId);
+            if(state == 107 && order.getState() != 106){
+                redisUtil.unlock(orderId + "");
+                return ResultUtil.error("操作失败，请刷新数据");
+            }
+            if(state == 108 && order.getState() != 107){
+                redisUtil.unlock(orderId + "");
+                return ResultUtil.error("操作失败，请刷新数据");
+            }
+
+            order.setState(state);
+
+            if(payType == 2 && state == 107){
+                order.setPayType(3);
+            }
+
+            if(payType == 2 && state == 108){
+                order.setPayTime(new Date());
+                if(null != order.getCouponId()){
+                    UserToCoupon userToCoupon = userToCouponService.selectById(order.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.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                     accountChangeDetail.setUserType(2);
                     accountChangeDetail.setUserId(order.getDriverId());
                     accountChangeDetail.setCreateTime(new Date());
-                    accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+                    accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                     accountChangeDetail.setType(1);
                     accountChangeDetail.setChangeType(7);
                     accountChangeDetail.setOrderId(order.getId());
                     accountChangeDetail.setExplain("优惠券收入");
-                    driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
-                    accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+                    driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                    accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                     driverService.updateById(driver);
                     accountChangeDetailService.insert(accountChangeDetail);
 
@@ -1331,84 +1420,67 @@
                     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;
+                                discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                             }else{
                                 break;
                             }
                         }
                     }
-
-
                 }
             }
+            this.updateById(order);
 
-            if(order.getDiscountAmount() > 0){
+            if((payType == 1 && state == 107) || (payType == 2 && state == 108)){
+                //修改司机状态和积分
                 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() + order.getDiscountAmount());
-                accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+                driver.setServerStatus(1);
                 driverService.updateById(driver);
-                accountChangeDetailService.insert(accountChangeDetail);
+            }
 
-                //补贴中分账
-                Double discountedPrice = order.getDiscountAmount();
-                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
-                for (RechargeRecord rechargeRecord : rechargeRecords) {
-                    Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
-                    if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
-                        if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
-                            rechargeRecordService.updateById(rechargeRecord);
-                        }
-                        break;
-                    }else{
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                        if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
-                            rechargeRecordService.updateById(rechargeRecord);
-                            discountedPrice -= surplusDividedAmount;
-                        }else{
-                            break;
+            if(payType == 2 && state == 108){//计算抽成
+                saveRevenue(order);
+            }
+
+            PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+            pushOrderInfoWarpper.setId(order.getId());
+            pushOrderInfoWarpper.setState(order.getState());
+            pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+            if(null != order.getUserId()){
+                pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+            }
+
+            if(payType == 2 && state == 107){
+                new Timer().schedule(new TimerTask() {
+                    @Override
+                    public void run() {
+                        try {
+                            OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
+                        }catch (Exception e){
+                            e.printStackTrace();
                         }
                     }
-                }
+                }, 60000);
             }
+            redisUtil.unlock(orderId + "");
+            return ResultUtil.success();
+        }catch (Exception e){
+            redisUtil.unlock(orderId + "");
+            e.printStackTrace();
+            return ResultUtil.error("系统异常");
         }
-        this.updateById(order);
-
-        if(payType == 2 && state == 108){//计算抽成
-            saveRevenue(order);
-        }
-
-        PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
-        pushOrderInfoWarpper.setId(order.getId());
-        pushOrderInfoWarpper.setState(order.getState());
-        pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
-        if(null != order.getUserId()){
-            pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
-        }
-        return ResultUtil.success();
     }
 
 
@@ -1422,11 +1494,11 @@
      * @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);
-        transfer.setAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+        transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
         transfer.setOrderName("补贴");
         transfer.setNotifyUrl(notifyUrl);
         transfer.setParameter1(id.toString());
@@ -1434,12 +1506,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());
@@ -1457,31 +1530,32 @@
         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", order.getUserId()).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);
+        if(null != order.getUserId()){
+            //司机推荐首单收入
+            List<Integer> state = Arrays.asList(107, 108, 109);
+            int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).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(5));
+                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);
+            }
         }
-
 
 
         SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
@@ -1492,17 +1566,17 @@
             if(order.getOrderMoney() >= num2){//订单金额大于num2才有抽佣金
                 driver = driverService.selectById(order.getDriverId());
                 AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
-                accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                 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.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                accountChangeDetail1.setExplain("订单信息费");
                 accountChangeDetail1.setCreateTime(new Date());
-                driver.setBalance(driver.getBalance() - num3);
-                accountChangeDetail1.setNewData(driver.getBalance() + driver.getBackgroundBalance());
+                driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                accountChangeDetail1.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                 driverService.updateById(driver);
                 accountChangeDetailService.saveData(accountChangeDetail1);
 
@@ -1512,7 +1586,7 @@
                 if(null != systemConfig1){
                     JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
                     //司机推荐用户收入
-                    if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+                    if(null != appUser && null != appUser.getInviterType() && appUser.getInviterType() == 2){
                         Double num1 = jsonObject1.getDouble("num1");
                         num1 = (num3 >= num1 ? num1 : num3);
 
@@ -1520,16 +1594,16 @@
                             Driver driver1 = driverService.selectById(appUser.getInviterId());
                             //首单积分奖励
                             AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                             accountChangeDetail.setUserType(2);
                             accountChangeDetail.setUserId(driver1.getId());
                             accountChangeDetail.setType(1);
                             accountChangeDetail.setChangeType(5);
-                            accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+                            accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                             accountChangeDetail.setExplain("邀请用户奖励");
                             accountChangeDetail.setCreateTime(new Date());
-                            driver1.setCommission(driver1.getCommission() + num1);
-                            accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                            driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                            accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                             accountChangeDetailService.saveData(accountChangeDetail);
                             driverService.updateById(driver1);
 
@@ -1549,7 +1623,7 @@
                                 if(surplusDividedAmount.compareTo(num1_1) >= 0){
                                     ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
                                     if(fengzhang.getCode() == 10000){
-                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
+                                        rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                         rechargeRecordService.updateById(rechargeRecord);
                                     }
                                     break;
@@ -1558,7 +1632,7 @@
                                     if(fengzhang.getCode() == 10000){
                                         rechargeRecord.setSurplusDividedAmount(0d);
                                         rechargeRecordService.updateById(rechargeRecord);
-                                        num1_1 -= surplusDividedAmount;
+                                        num1_1 = new BigDecimal(num1_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                     }else{
                                         break;
                                     }
@@ -1566,7 +1640,8 @@
                             }
 
                         }
-                        num3 = (num3 >= num1 ? num3 - num1 : 0);
+                        double v = new BigDecimal(num3).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                        num3 = (num3 >= num1 ? v : 0);
                     }
 
                     //开始处理层级抽佣
@@ -1591,16 +1666,16 @@
                                     revenueService.insert(revenue);
 
                                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                     accountChangeDetail.setUserType(2);
                                     accountChangeDetail.setUserId(driver1.getId());
                                     accountChangeDetail.setType(1);
                                     accountChangeDetail.setChangeType(5);
-                                    accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     accountChangeDetail.setExplain("订单分佣收入");
                                     accountChangeDetail.setCreateTime(new Date());
-                                    driver1.setCommission(driver1.getCommission() + num5);
-                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                    accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     driverService.updateById(driver1);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1611,7 +1686,7 @@
                                         if(surplusDividedAmount.compareTo(num5_1) >= 0){
                                             ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
                                             if(fengzhang.getCode() == 10000){
-                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
+                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
@@ -1620,14 +1695,14 @@
                                             if(fengzhang.getCode() == 10000){
                                                 rechargeRecord.setSurplusDividedAmount(0d);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num5_1 -= surplusDividedAmount;
+                                                num5_1 = new BigDecimal(num5_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-                                    num3 = (num3 >= num5 ? num3 - num5 : 0);
+                                    double v = new BigDecimal(num3).subtract(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                    num3 = (num3 >= num5 ? v : 0);
                                 }
                                 num6 = (num3 >= num6 ? num6 : num3);
                                 if(num6 > 0){
@@ -1641,16 +1716,16 @@
                                     revenueService.insert(revenue);
 
                                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                     accountChangeDetail.setUserType(2);
                                     accountChangeDetail.setUserId(driver2.getId());
                                     accountChangeDetail.setType(1);
                                     accountChangeDetail.setChangeType(5);
-                                    accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     accountChangeDetail.setExplain("订单分佣收入");
                                     accountChangeDetail.setCreateTime(new Date());
-                                    driver2.setCommission(driver2.getCommission() + num6);
-                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                    accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     driverService.updateById(driver2);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1661,7 +1736,7 @@
                                         if(surplusDividedAmount.compareTo(num6_1) >= 0){
                                             ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
                                             if(fengzhang.getCode() == 10000){
-                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
+                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
@@ -1670,14 +1745,14 @@
                                             if(fengzhang.getCode() == 10000){
                                                 rechargeRecord.setSurplusDividedAmount(0d);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num6_1 -= surplusDividedAmount;
+                                                num6_1 = new BigDecimal(num6_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-                                    num3 = (num3 >= num6 ? num3 - num6 : 0);
+                                    double v = new BigDecimal(num3).subtract(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                    num3 = (num3 >= num6 ? v : 0);
                                 }
                                 num7 = (num3 >= num7 ? num7 : num3);
                                 if(num7 > 0){
@@ -1691,16 +1766,16 @@
                                     revenueService.insert(revenue);
 
                                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                     accountChangeDetail.setUserType(2);
                                     accountChangeDetail.setUserId(driver3.getId());
                                     accountChangeDetail.setType(1);
                                     accountChangeDetail.setChangeType(5);
-                                    accountChangeDetail.setOldData(driver3.getCouponBalance() + driver3.getCommission());
+                                    accountChangeDetail.setOldData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     accountChangeDetail.setExplain("订单分佣收入");
                                     accountChangeDetail.setCreateTime(new Date());
-                                    driver3.setCommission(driver3.getCommission() + num7);
-                                    accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+                                    driver3.setCommission(new BigDecimal(driver3.getCommission()).add(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                    accountChangeDetail.setNewData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     driverService.updateById(driver3);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1711,7 +1786,7 @@
                                         if(surplusDividedAmount.compareTo(num7_1) >= 0){
                                             ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
                                             if(fengzhang.getCode() == 10000){
-                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
+                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
@@ -1720,14 +1795,14 @@
                                             if(fengzhang.getCode() == 10000){
                                                 rechargeRecord.setSurplusDividedAmount(0d);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num7_1 -= surplusDividedAmount;
+                                                num7_1 = new BigDecimal(num7_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-                                    num3 = (num3 >= num7 ? num3 - num7 : 0);
+                                    double v = new BigDecimal(num3).subtract(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                    num3 = (num3 >= num7 ? v : 0);
                                 }
                             }else{
                                 Double num3_ = jsonObject1.getDouble("num3");
@@ -1744,16 +1819,16 @@
                                     revenueService.insert(revenue);
 
                                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                     accountChangeDetail.setUserType(2);
                                     accountChangeDetail.setUserId(driver1.getId());
                                     accountChangeDetail.setType(1);
                                     accountChangeDetail.setChangeType(5);
-                                    accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+                                    accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     accountChangeDetail.setExplain("订单分佣收入");
                                     accountChangeDetail.setCreateTime(new Date());
-                                    driver1.setCommission(driver1.getCommission() + num3_);
-                                    accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                    driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                    accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     driverService.updateById(driver1);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1764,7 +1839,7 @@
                                         if(surplusDividedAmount.compareTo(num3_1) >= 0){
                                             ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
                                             if(fengzhang.getCode() == 10000){
-                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
@@ -1773,14 +1848,14 @@
                                             if(fengzhang.getCode() == 10000){
                                                 rechargeRecord.setSurplusDividedAmount(0d);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num3_1 -= surplusDividedAmount;
+                                                num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-                                    num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+                                    double v = new BigDecimal(num3).subtract(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                    num3 = (num3 >= num3_ ? v : 0);
                                 }
                                 num4 = (num3 >= num4 ? num4 : num3);
                                 if(num4 > 0){
@@ -1794,16 +1869,16 @@
                                     revenueService.insert(revenue);
 
                                     AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                     accountChangeDetail.setUserType(2);
                                     accountChangeDetail.setUserId(driver2.getId());
                                     accountChangeDetail.setType(1);
                                     accountChangeDetail.setChangeType(5);
-                                    accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+                                    accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     accountChangeDetail.setExplain("订单分佣收入");
                                     accountChangeDetail.setCreateTime(new Date());
-                                    driver2.setCommission(driver2.getCommission() + num4);
-                                    accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+                                    driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                    accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     driverService.updateById(driver2);
                                     accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1814,7 +1889,7 @@
                                         if(surplusDividedAmount.compareTo(num4_1) >= 0){
                                             ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
                                             if(fengzhang.getCode() == 10000){
-                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
+                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                                 rechargeRecordService.updateById(rechargeRecord);
                                             }
                                             break;
@@ -1823,14 +1898,14 @@
                                             if(fengzhang.getCode() == 10000){
                                                 rechargeRecord.setSurplusDividedAmount(0d);
                                                 rechargeRecordService.updateById(rechargeRecord);
-                                                num4_1 -= surplusDividedAmount;
+                                                num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                             }else{
                                                 break;
                                             }
                                         }
                                     }
-
-                                    num3 = (num3 >= num4 ? num3 - num4 : 0);
+                                    double v = new BigDecimal(num3).subtract(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                    num3 = (num3 >= num4 ? v : 0);
                                 }
                             }
                         }else{
@@ -1847,16 +1922,16 @@
                                 revenueService.insert(revenue);
 
                                 AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+                                accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
                                 accountChangeDetail.setUserType(2);
                                 accountChangeDetail.setUserId(driver1.getId());
                                 accountChangeDetail.setType(1);
                                 accountChangeDetail.setChangeType(5);
-                                accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+                                accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                 accountChangeDetail.setExplain("订单分佣收入");
                                 accountChangeDetail.setCreateTime(new Date());
-                                driver1.setCommission(driver1.getCommission() + num2_);
-                                accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+                                driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+                                accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                 driverService.updateById(driver1);
                                 accountChangeDetailService.saveData(accountChangeDetail);
 
@@ -1867,7 +1942,7 @@
                                     if(surplusDividedAmount.compareTo(num2_1) >= 0){
                                         ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
                                         if(fengzhang.getCode() == 10000){
-                                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
+                                            rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                             rechargeRecordService.updateById(rechargeRecord);
                                         }
                                         break;
@@ -1876,13 +1951,14 @@
                                         if(fengzhang.getCode() == 10000){
                                             rechargeRecord.setSurplusDividedAmount(0d);
                                             rechargeRecordService.updateById(rechargeRecord);
-                                            num2_1 -= surplusDividedAmount;
+                                            num2_1 = new BigDecimal(num2_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                         }else{
                                             break;
                                         }
                                     }
                                 }
-                                num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+                                double v = new BigDecimal(num3).subtract(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                                num3 = (num3 >= num2_ ? v : 0);
                             }
                         }
                     }
@@ -1904,7 +1980,7 @@
                             if(surplusDividedAmount.compareTo(num3) >= 0){
                                 ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3, 3);
                                 if(fengzhang.getCode() == 10000){
-                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3);
+                                    rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
                                     rechargeRecordService.updateById(rechargeRecord);
                                 }
                                 break;
@@ -1913,7 +1989,7 @@
                                 if(fengzhang.getCode() == 10000){
                                     rechargeRecord.setSurplusDividedAmount(0d);
                                     rechargeRecordService.updateById(rechargeRecord);
-                                    num3 -= surplusDividedAmount;
+                                    num3 = new BigDecimal(num3).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                                 }else{
                                     break;
                                 }
@@ -1953,7 +2029,7 @@
         List<PamentOrderUser> splitList = new ArrayList<>();
         PamentOrderUser pamentOrderUser = new PamentOrderUser();
         pamentOrderUser.setSplitUserId(merchantNumber);
-        pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+        pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
         pamentOrderUser.setSplitType("1");
         splitList.add(pamentOrderUser);
         complete.setSplitList(splitList);
@@ -1964,7 +2040,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){
@@ -1972,20 +2048,21 @@
                 divisionRecord.setPayTime(new Date());
                 divisionRecord.setState(2);
                 divisionRecordService.updateById(divisionRecord);
-                //间隔10秒开始调用确认收货后开始提现
+                //间隔1分钟开始调用确认收货后开始提现
 
                 new Timer().schedule(new TimerTask() {//确认收货和提现
                     @Override
                     public void run() {
                         confirmReceipt(merchantNumber, merOrderId, divisionRecord);
                     }
-                }, 15000);
+                }, 60000);
                 return ResultUtil.success();
             }
         }else{
-            System.err.println("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+            logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
             return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
         }
+        logger.warn("未知异常");
         return ResultUtil.error("未知异常");
     }
 
@@ -2000,11 +2077,11 @@
         Receive receive = new Receive();
         receive.setOriginalMerOrderId(orderNumber);
         receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
-        receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+        receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
         List<ReceiveUser> splitList = new ArrayList<>();
         ReceiveUser receiveUser = new ReceiveUser();
         receiveUser.setSplitUserId(merchantNumber);
-        receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+        receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
         splitList.add(receiveUser);
         receive.setSplitList(splitList);
         TrhRequest<Receive> request = new TrhRequest();
@@ -2012,9 +2089,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());
         }
     }
 
@@ -2190,106 +2267,88 @@
         List<Order> orders = this.selectList(new EntityWrapper<Order>().eq("state", 107).eq("status", 1)
                 .eq("payType", 3).last(" and UNIX_TIMESTAMP(getoffTime) + 600 <= UNIX_TIMESTAMP(now())"));
         for (Order order : orders) {
-            order.setState(108);
-            order.setPayTime(new Date());
-            if(null != order.getCouponId()){
-                UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
-                if(userToCoupon.getValidCount() > 0){
-                    userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
-                    userToCouponService.updateById(userToCoupon);
-                    Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
-
-                    Driver driver = driverService.selectById(order.getDriverId());
-                    AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
-                    accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
-                    accountChangeDetail.setUserType(2);
-                    accountChangeDetail.setUserId(order.getDriverId());
-                    accountChangeDetail.setCreateTime(new Date());
-                    accountChangeDetail.setOldData(driver.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));
-                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() + order.getDiscountAmount());
-                accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
-                driverService.updateById(driver);
-                accountChangeDetailService.insert(accountChangeDetail);
-
-                //补贴中分账
-                Double discountedPrice = order.getDiscountAmount();
-                List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
-                for (RechargeRecord rechargeRecord : rechargeRecords) {
-                    Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
-                    if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
-                        if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
-                            rechargeRecordService.updateById(rechargeRecord);
-                        }
-                        break;
-                    }else{
-                        ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
-                        if(10000 == zhaunzhang.getCode()){
-                            rechargeRecord.setSurplusDividedAmount(0D);
-                            rechargeRecordService.updateById(rechargeRecord);
-                            discountedPrice -= surplusDividedAmount;
-                        }else{
-                            break;
-                        }
-                    }
-                }
-            }
-
-            this.updateById(order);
-
+            Long orderId = order.getId();
             try {
-                saveRevenue(order);
-            } catch (Exception e) {
+                boolean lock = redisUtil.lock(orderId + "",5);
+                if(!lock){
+                    int num1 = 1;
+                    while (num1 <= 10){
+                        Thread.sleep(3000);//等待3秒
+                        lock = redisUtil.lock(orderId + "",5);
+                        if(lock){
+                            break;
+                        }else{
+                            num1++;
+                        }
+                    }
+                }
+                if(!lock){
+                    redisUtil.unlock(orderId + "");
+                    continue;
+                }
+                completeCollection_(order);
+            }catch (Exception e){
+                redisUtil.unlock(orderId + "");
                 e.printStackTrace();
             }
         }
     }
+
+
+
+
+
+    public void completeCollection_(Order order) throws Exception{
+        order.setState(108);
+        order.setPayTime(new Date());
+        if(null != order.getCouponId()){
+            UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+            Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+            Driver driver = driverService.selectById(order.getDriverId());
+            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+            accountChangeDetail.setUserType(2);
+            accountChangeDetail.setUserId(order.getDriverId());
+            accountChangeDetail.setCreateTime(new Date());
+            accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+            accountChangeDetail.setType(1);
+            accountChangeDetail.setChangeType(7);
+            accountChangeDetail.setOrderId(order.getId());
+            accountChangeDetail.setExplain("优惠券收入");
+            driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+            accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+            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<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
+                        rechargeRecordService.updateById(rechargeRecord);
+                    }
+                    break;
+                }else{
+                    ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+                    if(10000 == zhaunzhang.getCode()){
+                        Double remainAmount = zhaunzhang.getData();
+                        rechargeRecord.setSurplusDividedAmount(remainAmount);
+                        rechargeRecordService.updateById(rechargeRecord);
+                        discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                    }else{
+                        break;
+                    }
+                }
+            }
+        }
+
+        this.updateById(order);
+        saveRevenue(order);
+    }
 }

--
Gitblit v1.7.1