超省新代驾
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2023-08-16 d5b3e5a413bcfccba294793ee093722f31b2448a 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java


@@ -112,6 +112,9 @@


    @Autowired


    private IRechargeRecordService rechargeRecordService;




    @Autowired


    private IOrderService orderService;




    @Value("${wx.appletsAppid}")


    private String appletsAppid;




@@ -167,7 +170,7 @@


        int i = 0;


        Double scope = 5D;


        while (true){


            List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getLng().toString(), estimatedCosts.getLat().toString(), scope);


            List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString(), scope);


            if(nearbyDriverWarppers.size() == 0){


                scope += 5;


                i++;


@@ -482,7 +485,7 @@




        for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {


            order.setId(null);


            order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));


            order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));


            boolean insert = this.insert(order);


            if(insert){


                //推送状态


@@ -565,13 +568,16 @@


                List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)


                        .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));


                Double d = null;




                System.err.println("【" + orderId + "】所有优推司机：" + JSON.toJSONString(youTuiDrivers));


                for (YouTuiDriver youTuiDriver : youTuiDrivers) {


                    String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());


                    if(ToolUtil.isEmpty(value)){


                        continue;


                    }


                    Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());


                    if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){


                    int count = orderService.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));


@@ -586,6 +592,7 @@


                        youTuiDriver1 = youTuiDriver;


                    }


                }


                System.err.println("【" + orderId + "】优推最终司机---》距离：" +  d + "，司机：" + JSON.toJSONString(driver) + "，优推数据：" + JSON.toJSONString(youTuiDriver1));


            }


            if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){


                youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);


@@ -615,6 +622,7 @@


                            continue;


                        }




                        System.err.println("【" + orderId + "】范围推送【第" + i + "轮】：" + JSON.toJSONString(drivers));


                        Integer integral = null;//积分


                        Double score = null;//评分


                        Double d = null;


@@ -627,6 +635,10 @@


                            if(null == driverWork){


                                continue;


                            }


                            int count = orderService.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();


@@ -635,6 +647,8 @@


                                Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());


                                Double wgs84 = distance.get("WGS84");


                                d = wgs84;




                                System.err.println("【" + orderId + "】范围推送【第" + i + "轮】----》【积分：" + integral + "、司机：" + JSON.toJSONString(driver1));


                                continue;


                            }


                            if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分


@@ -644,6 +658,8 @@


                                Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());


                                Double wgs84 = distance.get("WGS84");


                                d = wgs84;




                                System.err.println("【" + orderId + "】范围推送【第" + i + "轮】----》【评分：" + score + "、司机：" + JSON.toJSONString(driver1));


                                continue;


                            }


                            if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离


@@ -654,11 +670,13 @@


                                    integral = driver1.getIntegral();


                                    score = driver1.getScore();


                                    driver = driver1.getId();




                                    System.err.println("【" + orderId + "】范围推送【第" + i + "轮】----》距离：" + d + "、司机：" + JSON.toJSONString(driver1));


                                    continue;


                                }


                            }


                        }




                        System.err.println("【" + orderId + "】范围推送【第" + i + "轮】最终司机----》距离：" + d + "、司机：" + JSON.toJSONString(driver));


                    }


                }


            }


@@ -824,6 +842,12 @@


    @Override


    public ResultUtil editOrderEndAddress(Integer uid, EditOrderEndAddress editOrderEndAddress) throws Exception {


        Order order = this.selectById(editOrderEndAddress.getOrderId());




        String endAddress = editOrderEndAddress.getEndAddress();


        endAddress = endAddress.replaceAll("& #40;", "(");


        endAddress = endAddress.replaceAll("& #41;", ")");


        editOrderEndAddress.setEndAddress(endAddress);




        order.setEndAddress(editOrderEndAddress.getEndAddress());


        order.setEndLat(editOrderEndAddress.getEndLat().toString());


        order.setEndLng(editOrderEndAddress.getEndLng().toString());


@@ -896,6 +920,7 @@


        orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());


        orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());


        orderPriceWarpper.setPayMoney(order.getPayMoney());


        orderPriceWarpper.setOrderMoney(order.getOrderMoney());


        if(order.getState() < 107){


            orderPriceWarpper.setPayMoney(order.getOrderMoney());


        }


@@ -936,9 +961,9 @@


            orderPriceWarpper.setCouponId(coupon.getId());


        }


        if(payType == 1 && null == couponId && appUser.getHavDiscount() == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣


            orderPriceWarpper.setDiscount(9D);


            orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            orderMoney = new BigDecimal(orderMoney * 0.9).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


            orderPriceWarpper.setDiscount(9.5D);


            orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.05).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            orderMoney = new BigDecimal(orderMoney * 0.95).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


        }


        if(null != couponId){


            UserToCoupon userToCoupon = userToCouponService.selectById(couponId);


@@ -990,7 +1015,7 @@


            return ResultUtil.error("不允许支付");


        }


        if(orderPayment.getPayType() == 2){


            Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.9 : 1);


            Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.95 : 1);


            if(appUser.getAccountBalance() < payMoney){


                return ResultUtil.error("账户余额不足");


            }


@@ -1027,7 +1052,7 @@




        PaymentOrder paymentOrder = new PaymentOrder();


        paymentOrder.setBizOrderId(out_trade_no);


        paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));


        paymentOrder.setAmount(new BigDecimal(payMoney).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");


        paymentOrder.setOrderName("代驾服务费");


        paymentOrder.setPayType("WX_MINI");


        paymentOrder.setTransferType("0");


@@ -1139,7 +1164,7 @@






        AccountChangeDetail accountChangeDetail = new AccountChangeDetail();


        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


        accountChangeDetail.setUserType(1);


        accountChangeDetail.setUserId(appUser.getId());


        accountChangeDetail.setCreateTime(new Date());


@@ -1148,7 +1173,7 @@


        accountChangeDetail.setChangeType(2);


        accountChangeDetail.setOrderId(order.getId());


        accountChangeDetail.setExplain("代驾服务费");


        appUser.setAccountBalance(appUser.getAccountBalance() - payMoney);


        appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        accountChangeDetail.setNewData(appUser.getAccountBalance());


        appUserService.updateById(appUser);


        accountChangeDetailService.insert(accountChangeDetail);


@@ -1172,7 +1197,7 @@


        order.setPayType(1);




        AccountChangeDetail accountChangeDetail = new AccountChangeDetail();


        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


        accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


        accountChangeDetail.setUserType(1);


        accountChangeDetail.setUserId(appUser.getId());


        accountChangeDetail.setCreateTime(new Date());


@@ -1181,25 +1206,33 @@


        accountChangeDetail.setChangeType(2);


        accountChangeDetail.setOrderId(order.getId());


        accountChangeDetail.setExplain("代驾服务费");


        appUser.setAccountBalance(appUser.getAccountBalance() > payMoney ? appUser.getAccountBalance() - payMoney : 0);




        Double wx_p = 0D;


        if(payMoney.compareTo(appUser.getAccountBalance()) > 0){//支付金额大于账户余额


            wx_p = new BigDecimal(payMoney).subtract(new BigDecimal(appUser.getAccountBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


            order.setBalancePayment(appUser.getAccountBalance());


            order.setWeChatPayment(wx_p);


            appUser.setAccountBalance(0D);


        }else{


            order.setBalancePayment(payMoney);


            order.setWeChatPayment(0D);


            appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        }


        accountChangeDetail.setNewData(appUser.getAccountBalance());


        appUserService.updateById(appUser);


        accountChangeDetailService.insert(accountChangeDetail);




        order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);


        payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;


        order.setWeChatPayment(payMoney);


        order.setResidueBalancePayment(order.getBalancePayment());


        order.setResidueWeChatPayment(order.getWeChatPayment());




        if(0 < payMoney){//还需要调起微信支付


        if(0 < wx_p){//还需要调起微信支付


            order.setPayType(4);


            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");


            String out_trade_no = sdf.format(new Date()) + order.getId();




            PaymentOrder paymentOrder = new PaymentOrder();


            paymentOrder.setBizOrderId(out_trade_no);


            paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));


            paymentOrder.setAmount(new BigDecimal(wx_p).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");


            paymentOrder.setOrderName("代驾服务费");


            paymentOrder.setPayType("WX_MINI");


            paymentOrder.setTransferType("0");


@@ -1266,7 +1299,7 @@


                                    if("2".equals(status1) || 10 == num){//失败


                                        Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();


                                        AppUser appUser1 = appUserService.selectById(order1.getUserId());


                                        appUser1.setAccountBalance(appUser1.getAccountBalance() + m);


                                        appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(m)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                        appUserService.updateById(appUser1);


                                        accountChangeDetailService.deleteById(accountChangeDetail.getId());


                                        break;


@@ -1374,7 +1407,7 @@




                //增加积分变动记录


                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());


@@ -1395,7 +1428,7 @@




                //增加积分变动记录


                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());


@@ -1432,17 +1465,17 @@


        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(driver.getId());


        accountChangeDetail.setType(1);


        accountChangeDetail.setChangeType(1);


        accountChangeDetail.setOrderId(order.getId());


        accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());


        driver.setCommission(driver.getCommission() + order.getPayMoney());


        accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        accountChangeDetail.setExplain("订单收入");


        accountChangeDetail.setCreateTime(new Date());


        accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());


        accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driverService.updateById(driver);


        accountChangeDetailService.saveData(accountChangeDetail);


        //订单收入


@@ -1450,17 +1483,17 @@




        if(null != order.getCouponId()){


            accountChangeDetail = new AccountChangeDetail();


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


            accountChangeDetail.setUserType(2);


            accountChangeDetail.setUserId(driver.getId());


            accountChangeDetail.setType(1);


            accountChangeDetail.setChangeType(7);


            accountChangeDetail.setOrderId(order.getId());


            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());


            driver.setCommission(driver.getCommission() + order.getDiscountedPrice());


            accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            accountChangeDetail.setExplain("优惠券收入");


            accountChangeDetail.setCreateTime(new Date());


            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());


            accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driverService.updateById(driver);


            accountChangeDetailService.saveData(accountChangeDetail);




@@ -1483,7 +1516,7 @@


                        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;


                    }


@@ -1512,7 +1545,7 @@


            JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());


            Integer num4 = jsonObject2.getInteger("num4");


            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(2);


@@ -1537,17 +1570,17 @@


            Double num3 = jsonObject.getDouble("num3");


            if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣


                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.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);




@@ -1562,7 +1595,7 @@


                        if(num1 > 0){


                            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);


@@ -1570,8 +1603,8 @@


                            accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());


                            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());


                            driverService.updateById(driver1);


                            accountChangeDetailService.saveData(accountChangeDetail);




@@ -1592,7 +1625,7 @@


                                if(surplusDividedAmount.compareTo(num1_1) >= 0){


                                    ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);


                                    if(10000 == fengzhang.getCode()){


                                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);


                                        rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                        rechargeRecordService.updateById(rechargeRecord);


                                    }


                                    break;


@@ -1601,14 +1634,15 @@


                                    if(10000 == fengzhang.getCode()){


                                        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;


                                    }


                                }


                            }


                        }


                        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);


                    }




                    //开始处理层级抽佣


@@ -1633,16 +1667,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);




@@ -1654,7 +1688,7 @@


                                        if(surplusDividedAmount.compareTo(num5_1) >= 0){


                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);


                                            if(10000 == fengzhang.getCode()){


                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);


                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                                rechargeRecordService.updateById(rechargeRecord);


                                            }


                                            break;


@@ -1663,14 +1697,14 @@


                                            if(10000 == fengzhang.getCode()){


                                                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 && null != driver2){


@@ -1684,16 +1718,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);




@@ -1705,7 +1739,7 @@


                                        if(surplusDividedAmount.compareTo(num6_1) >= 0){


                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);


                                            if(10000 == fengzhang.getCode()){


                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);


                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                                rechargeRecordService.updateById(rechargeRecord);


                                            }


                                            break;


@@ -1714,13 +1748,14 @@


                                            if(10000 == fengzhang.getCode()){


                                                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 && null != driver3){


@@ -1734,16 +1769,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);




@@ -1755,7 +1790,7 @@


                                        if(surplusDividedAmount.compareTo(num7_1) >= 0){


                                            ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);


                                            if(10000 == fengzhang.getCode()){


                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);


                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                                rechargeRecordService.updateById(rechargeRecord);


                                            }


                                            break;


@@ -1764,14 +1799,14 @@


                                            if(10000 == fengzhang.getCode()){


                                                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");


@@ -1788,16 +1823,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);




@@ -1809,7 +1844,7 @@


                                        if(surplusDividedAmount.compareTo(num3_1) >= 0){


                                            ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);


                                            if(10000 == fengzhang.getCode()){


                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);


                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                                rechargeRecordService.updateById(rechargeRecord);


                                            }


                                            break;


@@ -1818,14 +1853,14 @@


                                            if(10000 == fengzhang.getCode()){


                                                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 && null != driver2){


@@ -1839,16 +1874,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);




@@ -1860,7 +1895,7 @@


                                        if(surplusDividedAmount.compareTo(num4_1) >= 0){


                                            ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);


                                            if(10000 == fengzhang.getCode()){


                                                rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);


                                                rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                                rechargeRecordService.updateById(rechargeRecord);


                                            }


                                            break;


@@ -1869,14 +1904,14 @@


                                            if(10000 == fengzhang.getCode()){


                                                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{


@@ -1893,16 +1928,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);




@@ -1914,7 +1949,7 @@


                                    if(surplusDividedAmount.compareTo(num2_1) >= 0){


                                        ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);


                                        if(10000 == fengzhang.getCode()){


                                            rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);


                                            rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                            rechargeRecordService.updateById(rechargeRecord);


                                        }


                                        break;


@@ -1923,14 +1958,14 @@


                                        if(10000 == fengzhang.getCode()){


                                            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);


                            }


                        }


                    }


@@ -1954,7 +1989,7 @@


                            if(surplusDividedAmount.compareTo(num3_1) >= 0){


                                ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);


                                if(10000 == fengzhang.getCode()){


                                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);


                                    rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                                    rechargeRecordService.updateById(rechargeRecord);


                                }


                                break;


@@ -1963,7 +1998,7 @@


                                if(10000 == fengzhang.getCode()){


                                    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;


                                }


@@ -1993,22 +2028,22 @@


        revenue.setUserType(2);


        revenue.setUserId(driver.getId());


        revenue.setOrderId(order.getId());


        revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());


        revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice());//todo 折扣司机承担


        revenue.setCreateTime(new Date());


        revenueService.insert(revenue);




        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(1);


        accountChangeDetail1.setOrderId(order.getId());


        accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());


        driver.setCommission(driver.getCommission() + order.getPayMoney());


        accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        accountChangeDetail1.setExplain("订单收入");


        accountChangeDetail1.setCreateTime(new Date());


        accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());


        accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driverService.updateById(driver);


        accountChangeDetailService.saveData(accountChangeDetail1);




@@ -2020,7 +2055,7 @@


            if(surplusDividedAmount.compareTo(num3_1) >= 0){


                ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);


                if(10000 == fengzhang.getCode()){


                    rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);


                    rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                    rechargeRecordService.updateById(rechargeRecord);


                }


                break;


@@ -2029,7 +2064,7 @@


                if(10000 == fengzhang.getCode()){


                    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;


                }


@@ -2039,17 +2074,17 @@




        if(null != order.getCouponId()){


            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


            accountChangeDetail.setUserType(2);


            accountChangeDetail.setUserId(driver.getId());


            accountChangeDetail.setType(1);


            accountChangeDetail.setChangeType(7);


            accountChangeDetail.setOrderId(order.getId());


            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());


            driver.setCommission(driver.getCommission() + order.getDiscountedPrice());


            accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            accountChangeDetail.setExplain("优惠券收入");


            accountChangeDetail.setCreateTime(new Date());


            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());


            accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driverService.updateById(driver);


            accountChangeDetailService.saveData(accountChangeDetail);




@@ -2072,7 +2107,7 @@


                        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;


                    }


@@ -2083,7 +2118,7 @@


        // TODO: 2023/6/25 折扣优惠由司机承担


//        if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){


//            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();


//            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


//            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


//            accountChangeDetail.setUserType(2);


//            accountChangeDetail.setUserId(driver.getId());


//            accountChangeDetail.setType(1);


@@ -2143,17 +2178,17 @@


        revenueService.insert(revenue);




        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(1);


        accountChangeDetail1.setOrderId(order.getId());


        accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());


        driver.setCommission(driver.getCommission() + order.getPayMoney());


        accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        accountChangeDetail1.setExplain("订单收入");


        accountChangeDetail1.setCreateTime(new Date());


        accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());


        accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        driverService.updateById(driver);


        accountChangeDetailService.saveData(accountChangeDetail1);




@@ -2166,14 +2201,14 @@


            if(10000 != fengzhang.getCode()){


                return;


            }


            order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);


            order.setResidueWeChatPayment(new BigDecimal(order.getResidueWeChatPayment()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


        }else{


            ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);


            if(10000 != fengzhang.getCode()){


                return;


            }


            order.setResidueWeChatPayment(0D);


            num3_1 -= residueWeChatPayment;


            num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(residueWeChatPayment)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();




            //账户余额继续分账


            List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));


@@ -2182,9 +2217,9 @@


                if(surplusDividedAmount.compareTo(num3_1) >= 0){


                    ResultUtil fengzhang1 = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);


                    if(10000 == fengzhang1.getCode()){


                        rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);


                        rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                        rechargeRecordService.updateById(rechargeRecord);


                        order.setResidueBalancePayment(residueBalancePayment - num3_1);


                        order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                    }


                    break;


                }else{


@@ -2192,8 +2227,8 @@


                    if(10000 == fengzhang1.getCode()){


                        rechargeRecord.setSurplusDividedAmount(0D);


                        rechargeRecordService.updateById(rechargeRecord);


                        num3_1 -= surplusDividedAmount;


                        order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);


                        num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();


                        order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


                    }else{


                        break;


                    }


@@ -2204,17 +2239,17 @@




        if(null != order.getCouponId()){


            AccountChangeDetail accountChangeDetail = new AccountChangeDetail();


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));


            accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));


            accountChangeDetail.setUserType(2);


            accountChangeDetail.setUserId(driver.getId());


            accountChangeDetail.setType(1);


            accountChangeDetail.setChangeType(7);


            accountChangeDetail.setOrderId(order.getId());


            accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());


            driver.setCommission(driver.getCommission() + order.getDiscountedPrice());


            accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            accountChangeDetail.setExplain("优惠券收入");


            accountChangeDetail.setCreateTime(new Date());


            accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());


            accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());


            driverService.updateById(driver);


            accountChangeDetailService.saveData(accountChangeDetail);


            //补贴中分账


@@ -2236,7 +2271,7 @@


                        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;


                    }


@@ -2273,7 +2308,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);


@@ -2292,14 +2327,14 @@


                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{


@@ -2321,11 +2356,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();


@@ -2353,7 +2388,7 @@


        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());