5.24

luodangjia

2024-05-24 e54fa07c75837a4455d75193fdb33b757262fd21

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

@@ -18,6 +18,7 @@
import com.stylefeng.guns.modular.system.model.Region;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.ITOrderTransferService;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.OrderListWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -73,6 +74,9 @@

    @Autowired
    private IOrderLogisticsService orderLogisticsService;
    @Autowired
    private ITOrderTransferService  orderTransferService;


    @Autowired
    private ALiSendSms aLiSendSms;
@@ -114,6 +118,9 @@
        //小件物流
        List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid);
        datas.addAll(list3);
        //接送机
        List<Map<String, Object>> list4 = orderTransferService.queryOrderList(state,uid);
        datas.addAll(list4);

        //分页
        if(datas.size() >= page * size){