修改bug

Pu Zhibing

2025-03-21 f88507a761ae5b8f47e52b81627ca485b500431a

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -331,21 +331,14 @@
        if(null == driver1 && result.getCode() == 200 && null != uid){
            if(type == 2){
                Driver driver = driverMapper.selectById(uid);
                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
                BigDecimal bigDecimal = new BigDecimal("0");
                for(Map<String, Object> map : query){
                    DriverActivityHistory dah = new DriverActivityHistory();
                    dah.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                    dah.setDriverId(uid);
                    dah.setType(1);
                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
                for (DriverActivityHistory driverActivityHistory : list) {
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                    if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                        bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                        incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
                    }
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -527,21 +520,14 @@
        if(null != uid){
            if(type == 2){
                driver = driverMapper.selectById(uid);
                List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
                BigDecimal bigDecimal = new BigDecimal("0");
                for(Map<String, Object> map : query){
                    DriverActivityHistory dah = new DriverActivityHistory();
                    dah.setDriverActivityId(Integer.valueOf(map.get("driverActivityId").toString()));
                    dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                    dah.setDriverId(uid);
                    dah.setType(1);
                    DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
                for (DriverActivityHistory driverActivityHistory : list) {
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                    if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
                        bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
                        incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, Double.valueOf(String.valueOf(map.get("money"))));
                    }
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -1150,25 +1136,6 @@
        Map<String, Object> map = driverMapper.queryHomeData(uid);
        int size = this.queryMyActivity(uid, new Date(), language).size();
        map.put("activity", size);
        //获取司机待支付的现金支付订单推送司机支付
//        new Thread(new Runnable() {
//            @Override
//            public void run() {
//                List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
//                        .eq("driverPay", 1).eq("isDelete", 1));
//                if(orderPrivateCars.size() > 0){
//                    OrderPrivateCar orderPrivateCar = orderPrivateCars.get(0);
//                    pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
//                    return;
//                }
//                List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
//                        .eq("isDelete", 1).eq("driverPay", 1));
//                if(orderLogistics.size() > 0){
//                    OrderLogistics orderLogistics1 = orderLogistics.get(0);
//                    pushUtil.pushOfflinePayment(2, orderLogistics1.getDriverId(), orderLogistics1.getId(), orderLogistics1.getType());
//                }
//            }
//        }).start();
        return map;
    }