修改bug

Pu Zhibing

2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java

@@ -11,6 +11,7 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
@@ -26,12 +27,15 @@
 */
@Service
public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {

    
    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    @Override
    public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
        return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
    }

    
    @Override
    public Map<String, Object> getDriverById(Integer driverId) {
        return this.baseMapper.getDriverById(driverId);
@@ -71,14 +75,14 @@
    public List<Map<String, Object>> orderRevenueDetailsList(Page<Map<String, Object>> page, String driverName, String driverPhone, String createTime, Integer orderType) {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
        if (ToolUtil.isNotEmpty(createTime)) {
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        List<Map<String, Object>> list = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, ShiroExtUtil.getUser().getObjectId(), orderType);

        List<Map<String, Object>> list = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, shiroExtUtil.getUser().getObjectId(), orderType);
    
        page = new Page<>(0, 100000000);
        List<Map<String, Object>> list1 = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, ShiroExtUtil.getUser().getObjectId(), orderType);
        List<Map<String, Object>> list1 = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, shiroExtUtil.getUser().getObjectId(), orderType);
        BigDecimal orderMoney = new BigDecimal("0");
        BigDecimal money = new BigDecimal("0");
        BigDecimal payMoney = new BigDecimal("0");
@@ -100,24 +104,24 @@
    public HSSFWorkbook exportOrderRevenueDetails(String driverName, String driverPhone, String createTime, Integer orderType) throws Exception {
        String startTime = "";
        String endTime = "";
        if(ToolUtil.isNotEmpty(createTime)){
        if (ToolUtil.isNotEmpty(createTime)) {
            startTime = createTime.split(" - ")[0];
            endTime = createTime.split(" - ")[1];
        }
        Page<Map<String, Object>> page = new Page<>(0, 100000000);
        List<Map<String, Object>> list = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, ShiroExtUtil.getUser().getObjectId(), orderType);
        List<Map<String, Object>> list = this.baseMapper.orderRevenueDetailsList(page, driverName, driverPhone, startTime, endTime, shiroExtUtil.getUser().getObjectId(), orderType);
        String[] title = new String[]{"交易时间", "收益类型", "订单类型", "订单ID", "下单用户昵称", "下单用户手机", "乘车用户姓名"
                , "乘车用户手机", "起点", "终点", "司机名称", "司机手机号", "接单车辆", "支付类型", "订单原始金额", "平台抽佣金额", "司机订单收益支出"};
        String[][] values = new String[list.size()][17];
        for (int i = 0; i < list.size(); i++) {
            Map<String, Object> d = list.get(i);
            values[i][0]=null!=d.get("insertTime")?d.get("insertTime").toString():"";
            values[i][1]=d.get("incomeType")==null?"":
                    d.get("incomeType").toString().equals("1")?"活动收入":
                            d.get("incomeType").toString().equals("2")?"跑单收入":
                                    d.get("incomeType").toString().equals("3")?"取消订单收入":
                                            d.get("incomeType").toString().equals("4")?"改派订单收入":
                                                    d.get("incomeType").toString().equals("6")?"感谢费":
            values[i][0] = null != d.get("insertTime") ? d.get("insertTime").toString() : "";
            values[i][1] = d.get("incomeType") == null ? "" :
                    d.get("incomeType").toString().equals("1") ? "活动收入" :
                            d.get("incomeType").toString().equals("2") ? "跑单收入" :
                                    d.get("incomeType").toString().equals("3") ? "取消订单收入" :
                                            d.get("incomeType").toString().equals("4") ? "改派订单收入" :
                                                    d.get("incomeType").toString().equals("6") ? "感谢费" :
                                                            d.get("incomeType").toString().equals("7")?"超时扣款":
                                                                    d.get("incomeType").toString().equals("8")?"投诉扣款":
                                                                            d.get("incomeType").toString().equals("9")?"小件物流超时退款":"";