同步后台代码

puzhibing

2023-06-01 c4a098e3f88bc5071e36b92b9e5dcceb51129957

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java

@@ -14,6 +14,7 @@
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TOrder;
import com.stylefeng.guns.modular.system.service.ITAppUserService;
import com.stylefeng.guns.modular.system.service.ITCancelOrderService;
import com.stylefeng.guns.modular.system.service.ITOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -54,6 +55,8 @@
    private ITOrderService tOrderService;
    @Autowired
    private ITAppUserService tAppUserService;
    @Autowired
    private ITCancelOrderService tCancelOrderService;

    /**
     * 跳转到首页
@@ -183,7 +186,8 @@
                            String userPhone,
                            Integer state,
                            String driverName) {
        return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
//        return tOrderService.getOrderList(createTime, code, source, userName, userPhone, state, driverName,2);
        return tCancelOrderService.getCancelOrderList(createTime, code, source, userName, userPhone, state, driverName);
    }

    /**
@@ -198,7 +202,7 @@

        EntityWrapper<TOrder> wrapper = new EntityWrapper<>();
        if(Objects.nonNull(userId)){
            wrapper.eq("user_id",userId);
            wrapper.eq("userId",userId);
        }
        List<TOrder> tOrders = tOrderService.selectList(wrapper);
        for (TOrder tOrder : tOrders) {