修改bug

Pu Zhibing

昨天 c3b7673c16d026e57f8759b4cee99a42bf3c57f2

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -31,6 +31,9 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

/**
@@ -720,11 +723,11 @@
     */
    @Override
    public void reservationOrder() throws Exception {
        //快车
        List<OrderTaxi> list = orderTaxiService.queryMaturity();//获取所有快到期的预约单（出行时间在10分钟内）
        List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("orderType", 2).eq("state", 2)
                .eq("isDelete", 1).eq("isFrozen", 1).last(" and DATE_SUB(travelTime, INTERVAL 30 MINUTE) <= now()"));
        List<Driver> drivers = new ArrayList<>();
        Set<Integer> ids = new HashSet<>();
        for(OrderTaxi orderTaxi : list){
        for(OrderPrivateCar orderTaxi : orderPrivateCars){
            Driver driver = driverService.selectById(orderTaxi.getDriverId());
            if(driver.getState() == 2 && !ids.contains(driver.getId())){
                driver.setState(3);//修改司机为服务中
@@ -1010,6 +1013,28 @@
        return null;
    }

    @Override
    public void getTrackId(Integer orderId, Integer orderType, Integer trackId) {
        switch (orderType){
            case 1:
                orderPrivateCarService.getTrackId(orderId,trackId);
                break;
            case 2:
                break;
        }
    }

    @Override
    public void updatePrice(Integer orderId, Integer orderType, Integer priceType, BigDecimal updatePrice) {
        switch (orderType){
            case 1:
                orderPrivateCarService.updatePrice(orderId,priceType,updatePrice);
                break;
            case 2:
                break;
        }
    }

    @Autowired
    private ISystemNoticeService systemNoticeService;

@@ -1026,7 +1051,7 @@

        for(OrderPrivateCar order : orderList){
            if(order.getSmsTime()==null ){
                if(order.getGetoffTime().getTime()+24*60*60*1000L<day.getTime()){
                if((order.getTravelTime().getTime()+24*60*60*1000L)<day.getTime()){
                    order.setSmsNumber(order.getSmsNumber()+1);
                    order.setSmsTime(day);
                    //发送短信
@@ -1048,7 +1073,7 @@
                    systemNoticeService.addSystemNotice(1, "有一笔订单未付款，请前往支付！", order.getUserId());
                }
            }else{
                if(order.getSmsTime().getTime()+24*60*60*1000L<day.getTime()){
                if((order.getSmsTime().getTime()+24*60*60*1000L)<day.getTime()){
                    order.setSmsNumber(order.getSmsNumber()+1);
                    order.setSmsTime(day);
                    //发送短信