修改bug

Pu Zhibing

2 天以前 a698210ca8814673887121cb3a51ca324e4e037b

修改bug

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java

@@ -206,7 +206,7 @@
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://192.168.110.85:8010");
        }
        if("test".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java

@@ -98,7 +98,7 @@
        if(SinataUtil.isNotEmpty(endTime)){
            appComplaintsEntityWrapper.le("addTime",endTime +" 23:59:59");
        }
//        appComplaintsEntityWrapper.eq("type",1);
//        appComplaintsEntityWrapper.eq("type",3);
        Page<AppComplaints> page = new PageFactory<AppComplaints>().defaultPage();
        appComplaintsEntityWrapper.orderBy("addTime",false);//
        page.setRecords(appComplaintsService.selectMapsPage(page, appComplaintsEntityWrapper).getRecords());

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java

@@ -320,7 +320,7 @@
                        Integer dck1, Integer dck2,Integer driverDays) {
        //改派设置
        if("reassigningSet".equals(type)){
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(reformist)){
                reformist.setOpenCityId(openCityId);
                reformist.setMoney(one);
@@ -337,7 +337,7 @@
            }
        }
        if("driverPayDays".equals(type)){
            TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", shiroExtUtil.getUser().getObjectId()));
            TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(tDriverPayDays)){
                tDriverPayDays.setDay(driverDays);
                tDriverPayDays.setUpdateTime(new Date());
@@ -352,7 +352,7 @@

        //积分设置
        if("integralSet".equals(type)){
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(integral)){
                integral.setOpenCityId(openCityId);
                integral.setIntegral(two);
@@ -367,7 +367,7 @@

        //人脸识别
        if("faceRecognitionSettings".equals(type)){
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(faceDistinguish)){
                faceDistinguish.setOpenCityId(openCityId);
                faceDistinguish.setIsOpen(three);
@@ -385,7 +385,7 @@
        //推单设置
        if("pushOrderSettings".equals(type)){
            //快车推单(第一轮)
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 1));
            if (SinataUtil.isNotEmpty(zcOne)){
                zcOne.setOpenCityId(openCityId);
                zcOne.setPushDistance(zc1);
@@ -403,7 +403,7 @@
                tSysPushOrderService.insert(zcOne);
            }
            //快车推单(第二轮)
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 2));
            if (SinataUtil.isNotEmpty(zcTwo)){
                zcTwo.setOpenCityId(openCityId);
                zcTwo.setPushDistance(zc4);
@@ -421,7 +421,7 @@
                tSysPushOrderService.insert(zcTwo);
            }
            //快车推单(第三轮)
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 3));
            if (SinataUtil.isNotEmpty(zcThree)){
                zcThree.setOpenCityId(openCityId);
                zcThree.setPushDistance(zc7);
@@ -440,7 +440,7 @@
            }

            //出租车推单(第一轮)
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 1));
            if (SinataUtil.isNotEmpty(czcOne)){
                czcOne.setOpenCityId(openCityId);
                czcOne.setPushDistance(czc1);
@@ -458,7 +458,7 @@
                tSysPushOrderService.insert(czcOne);
            }
            //出租车推单(第二轮)
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 2));
            if (SinataUtil.isNotEmpty(czcTwo)){
                czcTwo.setOpenCityId(openCityId);
                czcTwo.setPushDistance(czc4);
@@ -476,7 +476,7 @@
                tSysPushOrderService.insert(czcTwo);
            }
            //出租车推单(第三轮)
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 3));
            if (SinataUtil.isNotEmpty(czcThree)){
                czcThree.setOpenCityId(openCityId);
                czcThree.setPushDistance(czc7);
@@ -498,7 +498,7 @@
        //取消设置
        if("cancelOrderSettings".equals(type)){
            //普通取消设置(快车)
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){
                ptCancelOne.setOpenCityId(openCityId);
                ptCancelOne.setMinuteNum(ptCancel1);
@@ -515,7 +515,7 @@
            }

            //普通取消设置(出租车)
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(ptCancelTwo)){
                ptCancelTwo.setOpenCityId(openCityId);
                ptCancelTwo.setMinuteNum(ptCancel3);
@@ -532,7 +532,7 @@
            }

            //普通取消设置(跨城出行)
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 3));
            if (SinataUtil.isNotEmpty(ptCancelThree)){
                ptCancelThree.setOpenCityId(openCityId);
                ptCancelThree.setMinuteNum(ptCancel5);
@@ -552,7 +552,7 @@
        //预约取消设置
        if("cancelTheReservationOrderSetting".equals(type)){
            //预约取消设置(快车)
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(yyCancelOne)){
                yyCancelOne.setOpenCityId(openCityId);
                yyCancelOne.setMinuteNum(yyCancel1);
@@ -568,7 +568,7 @@
                tSysCancleOrderService.insert(yyCancelOne);
            }
            //预约取消设置(出租车)
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(yyCancelTwo)){
                yyCancelTwo.setOpenCityId(openCityId);
                yyCancelTwo.setMinuteNum(yyCancel3);
@@ -587,7 +587,7 @@

        //拼单派单
        if("spellOrderSetting".equals(type)) {
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("openCityId", openCityId));
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("num1", pdpd1);
            jsonObject.put("num2", pdpd2);
@@ -610,7 +610,7 @@
        //电话设置
        if("phoneSettings".equals(type)){
            //报警电话
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 1));
            if (SinataUtil.isNotEmpty(phoneOne)){
                phoneOne.setOpenCityId(openCityId);
                phoneOne.setPhone(phone1);
@@ -628,7 +628,7 @@
                tPhoneService.insert(phoneOne);
            }
            //客服电话
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 2));
            if (SinataUtil.isNotEmpty(phoneTwo)){
                phoneTwo.setOpenCityId(openCityId);
                phoneTwo.setPhone(phone2);
@@ -647,7 +647,7 @@
            }

            //客服电话
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 3));
            if (SinataUtil.isNotEmpty(phone)){
                phone.setOpenCityId(openCityId);
                phone.setPhone(phone3);
@@ -666,7 +666,7 @@
            }

            //招聘电话
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 5));
            if (SinataUtil.isNotEmpty(phoneFive)){
                phoneFive.setOpenCityId(openCityId);
                phoneFive.setPhone(phone5);
@@ -688,7 +688,7 @@
        //95128
        if("95128TheOnCall".equals(type)){
            //95128电召电话
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 4));
            if (SinataUtil.isNotEmpty(phoneFour)){
                phoneFour.setOpenCityId(openCityId);
                phoneFour.setPhone(phone4);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml

@@ -66,14 +66,14 @@
        ID
        FROM
        sys_role
        WHERE r.objectId = #{objectId} and
        WHERE objectId = #{objectId} and
        ID IN

        <foreach collection="array" index="index" item="i" open="(" separator="," close=")">
            #{i}
        </foreach>

        ) r1 ON r.ID = r1.ID where objectId = #{objectId}
        ) r1 ON r.ID = r1.ID where r.objectId = #{objectId}
        ORDER BY
        pId,
        num ASC

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -586,7 +586,7 @@
     * @return
     */
    public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
        getPaymentInfoDataRequest.setPartnerId("5400004");
        getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        
        GetPaymentInfoRequest request = new GetPaymentInfoRequest();
        request.setRequstType("POST");

 ManagementQYTTravel/guns-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/etraffic/server/logs/management"/>
    <property name="log.path" value="/etraffic/server/chuxing/logs/management"/>
    
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_detail.html

@@ -6,8 +6,8 @@
                <div class="col-sm-6">
                    <input type="hidden" id="id" name="id" value="${item.id}">
                    <#label id="userId" name="用户id"  value="${item.userId}"/>
                    <#label id="phone" name="用户手机号"  value="${user.phone}"/>
                    <#label id="realName" name="真实姓名"  value="${user.name}"/>
                    <#label id="phone" name="用户手机号"  value="${null != user ? user.phone : ''}"/>
                    <#label id="realName" name="真实姓名"  value="${null != user ? user.name : ''}"/>
                    <#label id="identity" name="驾驶证号"  value="${item.license}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片</label>
@@ -18,7 +18,7 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">认证照片</label>
                        <div class="col-sm-9">
                            <img src="${user.certificationImg}" width="150px" height="150px" onclick="showBigPic(this)">
                            <img src="${null != user ? user.certificationImg : ''}" width="150px" height="150px" onclick="showBigPic(this)">
                        </div>
                    </div>
                    <#label id="identity" name="车辆品牌"  value="${item.carType}"/>

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -23,6 +23,10 @@
            validators: {
                notEmpty: {
                    message: '登录账号不能为空'
                },
                regexp: {
                    regexp: /^1[3-9]\d{9}$/,
                    message: '登录账号格式不正确'
                }
            }
        },
@@ -47,6 +51,17 @@
                    message: '两次密码不一致'
                },
            }
        },
        identifier: {
            validators: {
                notEmpty: {
                    message: '统一社会信用代码不能为空'
                },
                regexp: {
                    regexp: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/i,
                    message: '统一社会信用代码格式不正确'
                }
            }
        }
    }
};

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -16,6 +16,10 @@
            validators: {
                notEmpty: {
                    message: '登录账号不能为空'
                },
                regexp: {
                    regexp: /^1[3-9]\d{9}$/,
                    message: '登录账号格式不正确'
                }
            }
        },
@@ -51,6 +55,17 @@
                    message: '分账账期格式不正确'
                }
            }
        },
        identifier: {
            validators: {
                notEmpty: {
                    message: '统一社会信用代码不能为空'
                },
                regexp: {
                    regexp: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/i,
                    message: '统一社会信用代码格式不正确'
                }
            }
        }
    }
};