修改bug

Pu Zhibing

2025-03-12 b701b92c8af86026b2536c65ec9161037e88a8d9

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -85,6 +85,9 @@

    @Resource
    private DriverMapper driverMapper;
    
    @Autowired
    private DateUtil dateUtil;

    @Resource
    private DriverActivityRegisteredMapper driverActivityRegisteredMapper;
@@ -305,14 +308,17 @@
            if(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(uid, 2, 1, date.get("startTime"), date.get("endTime"));
                    BigDecimal bigDecimal = new BigDecimal("0");
                    for(Map<String, Object> map : query){
                        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, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
                        }
                    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);
                    }
                    
                    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());
                    driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -655,18 +661,13 @@
            if(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(uid, 2, 1, date.get("startTime"), date.get("endTime"));
                    BigDecimal bigDecimal = new BigDecimal("0");
                    for(Map<String, Object> map : query){
                        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, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
                        }
                        DriverActivityHistory dah = new DriverActivityHistory();
                        dah.setActivityId(Integer.valueOf(map.get("id").toString()));
                        dah.setDriverId(uid);
                        dah.setType(2);
                        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);
                    }