黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
4 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java


@@ -4,26 +4,26 @@


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.plugins.Page;


import com.stylefeng.guns.core.base.controller.BaseController;


import com.stylefeng.guns.core.beetl.ShiroExtUtil;


import com.stylefeng.guns.core.common.constant.factory.PageFactory;


import com.stylefeng.guns.core.shiro.ShiroKit;


import com.stylefeng.guns.core.log.LogObjectHolder;


import com.stylefeng.guns.core.util.DateUtil;


import com.stylefeng.guns.core.util.SinataUtil;


import com.stylefeng.guns.core.util.ToolUtil;


import com.stylefeng.guns.modular.system.model.TDriver;


import com.stylefeng.guns.modular.system.model.TOrderPosition;


import com.stylefeng.guns.modular.system.model.TOrderTaxi;


import com.stylefeng.guns.modular.system.model.TUser;


import com.stylefeng.guns.modular.system.service.*;


import com.stylefeng.guns.modular.system.util.HttpRequestUtil;


import com.stylefeng.guns.modular.system.util.PushURL;


import com.stylefeng.guns.modular.system.util.ResultUtil;


import org.apache.commons.collections.CollectionUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.*;


import org.springframework.ui.Model;


import org.springframework.beans.factory.annotation.Autowired;


import com.stylefeng.guns.core.log.LogObjectHolder;


import com.stylefeng.guns.modular.system.model.TOrderTaxi;


import org.springframework.web.bind.annotation.*;




import java.io.BufferedReader;


import java.io.File;


@@ -148,7 +148,7 @@


            endTime = timeArray[1];


        }


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();


        page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));


        page.setRecords(tOrderTaxiService.getTaxiOrderList(page, beginTime, endTime, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(), orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state));


        return super.packForBT(page);


    }




@@ -321,7 +321,7 @@


            tUser.setInsertTime(DateUtil.parseTime(DateUtil.getTime()));


            tUser.setPhone(tOrderTaxi.getPassengersPhone());


            tUser.setName(tOrderTaxi.getPassengers());


            tUser.setNickName("JYX" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));


            tUser.setNickName("QYT" + String.valueOf(1000000 + userService.selectList(null).size() + 1).substring(1));


            userService.insert(tUser);




            ///  存入订单信息