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


@@ -2,21 +2,22 @@




import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.plugins.Page;


import com.baomidou.mybatisplus.service.impl.ServiceImpl;


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


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


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


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


import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;


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


import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;


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


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


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


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


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


import com.baomidou.mybatisplus.service.impl.ServiceImpl;


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


import org.apache.poi.hssf.usermodel.HSSFWorkbook;


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


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


import java.math.BigDecimal;


import java.text.DateFormat;


import java.text.SimpleDateFormat;


import java.util.Arrays;


@@ -446,7 +447,7 @@




    @Override


    public List<Map<String, Object>> queryOtherIncomeDetail(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNo, String name, String phone) {


        Integer objectId = ShiroKit.getUser().getObjectId();


        Integer objectId = ShiroExtUtil.getUser().getObjectId();


        return this.baseMapper.queryOtherIncomeDetail(page, beginTime, endTime, orderNo, name, phone,objectId);


    }




@@ -455,8 +456,8 @@


        Date date = new Date();


        DateFormat format = new SimpleDateFormat("yyyyMMdd");


        String time = format.format(date);


        Integer objectId = ShiroKit.getUser().getObjectId();


        List<Map<String, Object>> mapList = this.baseMapper.exportOtherIncomeDetail(beginTime, endTime, orderNo, name, phone,objectId);


        Integer objectId = ShiroExtUtil.getUser().getObjectId();


        List<Map<String, Object>> mapList = this.baseMapper.exportOtherIncomeDetail(beginTime, endTime, orderNo, name, phone, objectId);


        String[] title = new String[] {"交易时间","订单号","下单用户昵称","下单用户手机号","感谢费"/*,"附加费"*/};


        String[][] values = new String[mapList.size()][];


        for (int i = 0; i < mapList.size(); i++) {