修改bug

puzhibing

2023-11-04 4becc1e8cdb2fbe0dcb94493b75a59ec1817028c

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -81,28 +81,28 @@
            driverActivityOnline.setOnline(num4);
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-出租车
            driverActivityOnline = new DriverActivityOnline();
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setInsertTime(nowDay);
            driverActivityOnline.setType(2);
            driverActivityOnline.setOnline(num6);
            driverActivityOnline.setMoney(num7);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-城际
            driverActivityOnline = new DriverActivityOnline();
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setInsertTime(nowDay);
            driverActivityOnline.setType(3);
            driverActivityOnline.setOnline(num8);
            driverActivityOnline.setMoney(num9);
            driverActivityOnline.insertOrUpdate();
//            //添加在线活动-出租车
//            driverActivityOnline = new DriverActivityOnline();
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setInsertTime(nowDay);
//            driverActivityOnline.setType(2);
//            driverActivityOnline.setOnline(num6);
//            driverActivityOnline.setMoney(num7);
//            driverActivityOnline.insertOrUpdate();
//            //添加在线活动-城际
//            driverActivityOnline = new DriverActivityOnline();
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setInsertTime(nowDay);
//            driverActivityOnline.setType(3);
//            driverActivityOnline.setOnline(num8);
//            driverActivityOnline.setMoney(num9);
//            driverActivityOnline.insertOrUpdate();
            //添加订单活动
            DriverActivityOrder driverActivityOrder = new DriverActivityOrder();
            driverActivityOrder.setCompanyId(driverActivity.getCompanyId());
@@ -168,33 +168,33 @@
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-出租车
            driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
            if(driverActivityOnline==null){
                driverActivityOnline = new DriverActivityOnline();
                driverActivityOnline.setInsertTime(nowDay);
            }
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setType(2);
            driverActivityOnline.setOnline(num6);
            driverActivityOnline.setMoney(num7);
            driverActivityOnline.insertOrUpdate();
            //添加在线活动-城际
            driverActivityOnline =driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",3));
            if(driverActivityOnline==null){
                driverActivityOnline = new DriverActivityOnline();
                driverActivityOnline.setInsertTime(nowDay);
            }
            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
            driverActivityOnline.setDriverActivityId(driverActivity.getId());
            driverActivityOnline.setStartTime(startTimes);
            driverActivityOnline.setEndTime(endTimes);
            driverActivityOnline.setType(3);
            driverActivityOnline.setOnline(num8);
            driverActivityOnline.setMoney(num9);
            driverActivityOnline.insertOrUpdate();
//            driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
//            if(driverActivityOnline==null){
//                driverActivityOnline = new DriverActivityOnline();
//                driverActivityOnline.setInsertTime(nowDay);
//            }
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setType(2);
//            driverActivityOnline.setOnline(num6);
//            driverActivityOnline.setMoney(num7);
//            driverActivityOnline.insertOrUpdate();
//            //添加在线活动-城际
//            driverActivityOnline =driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",3));
//            if(driverActivityOnline==null){
//                driverActivityOnline = new DriverActivityOnline();
//                driverActivityOnline.setInsertTime(nowDay);
//            }
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
//            driverActivityOnline.setDriverActivityId(driverActivity.getId());
//            driverActivityOnline.setStartTime(startTimes);
//            driverActivityOnline.setEndTime(endTimes);
//            driverActivityOnline.setType(3);
//            driverActivityOnline.setOnline(num8);
//            driverActivityOnline.setMoney(num9);
//            driverActivityOnline.insertOrUpdate();
            //添加订单活动
            DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",id));
            if(driverActivityOrder==null){