修改bug

Pu Zhibing

2 天以前 e809f5955584e600d8612540ea814977c49774c2

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -129,7 +129,8 @@
                       Integer rideType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser
                       String promotionUser,
                       Integer payType
    ) {
        String beginTime = null;
        String endTime = null;
@@ -140,7 +141,7 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
                orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null));
                orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null, payType));
        return super.packForBT(page);
    }

@@ -160,7 +161,7 @@
                       Integer rideType,
                       Integer abnormal,
                       Integer promotion,
                       String promotionUser, HttpServletRequest request, HttpServletResponse response) {
                       String promotionUser, Integer payType, HttpServletRequest request, HttpServletResponse response) {
        try {
            String beginTime = null;
            String endTime = null;
@@ -199,10 +200,12 @@
            shellList.add("接单车辆");
            shellList.add("订单金额");
            shellList.add("状态");
            shellList.add("支付方式");
            shellList.add("是否异常订单");
            shellList.add("是否推广订单");
            shellList.add("推广员姓名");
            shellList.add("推广员电话");
            shellList.add("所属公司");
            dataList.add(shellList);

            for (Map<String,Object> object : list){
@@ -295,11 +298,6 @@
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("contactPersonPhone"))){
                    shellList.add(object.get("contactPersonPhone").toString());
                }else{
                    shellList.add("-");
                }

                if(SinataUtil.isNotEmpty(object.get("startAddress"))){
                    shellList.add(object.get("startAddress").toString());
@@ -383,7 +381,22 @@
                            break;
                    }
                }

                if(SinataUtil.isNotEmpty(object.get("payType"))){
                    switch (object.get("payType").toString()){
                        case "1":
                            shellList.add("微信");
                            break;
                        case "3":
                            shellList.add("余额");
                            break;
                        case "5":
                            shellList.add("备付金");
                            break;
                        default:
                            shellList.add("-");
                            break;
                    }
                }

                if(SinataUtil.isNotEmpty(object.get("abnormal"))){
                    shellList.add(object.get("abnormal").toString().equals("1")?"否":"是");
@@ -409,6 +422,11 @@
                }else{
                    shellList.add("-");
                }
                if(SinataUtil.isNotEmpty(object.get("companyName"))){
                    shellList.add(object.get("companyName").toString());
                }else{
                    shellList.add("-");
                }


                dataList.add(shellList);