管理后台二期

xuhy

14 小时以前 b02d06c1421245e0e0cc82fc7a26a2508d81048f

管理后台二期

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java

@@ -69,9 +69,9 @@
    @ResponseBody
    @RequestMapping("/paymentOrderStatisticsList")
    public Object paymentOrderStatisticsList(String paymentCode, String orderCode, String userPhone,
                                             String driverPhone, String createTime, String paymentTime){
                                             String driverPhone, String createTime, String paymentTime,Integer orderType){
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
        List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
        return super.packForBT(page.setRecords(list));
    }
    
@@ -88,9 +88,10 @@
    @ResponseBody
    @RequestMapping("/paymentOrderStatisticsList_export")
    public void paymentOrderStatisticsList_export(String paymentCode, String orderCode, String userPhone,
                                                  String driverPhone, String createTime, String paymentTime, HttpServletRequest request, HttpServletResponse response){
                                                  String driverPhone, String createTime, String paymentTime,Integer orderType,
                                                  HttpServletRequest request, HttpServletResponse response){
        Page<Map<String, Object>> page = new Page(1, 9999);
        List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime);
        List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
        
        // 表格数据【封装】
        List<List<String>> dataList = new ArrayList<>();
@@ -99,6 +100,7 @@
        List<String> shellList = new ArrayList<String>();
        shellList.add("支付流水号");
        shellList.add("订单号");
        shellList.add("订单类型");
        shellList.add("支付用户手机号");
        shellList.add("支付金额");
        shellList.add("接单司机手机号");
@@ -121,6 +123,19 @@
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("orderType"))){
                int orderType1 = Integer.parseInt(object.get("orderType").toString());
                switch (orderType1){
                    case 2:
                        shellList.add("出租车订单");
                        break;
                    case 3:
                        shellList.add("跨城出行订单");
                        break;
                }
            }else{
                shellList.add("-");
            }
            if(SinataUtil.isNotEmpty(object.get("userPhone"))){
                shellList.add(object.get("userPhone").toString());
            }else{

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java

@@ -44,9 +44,12 @@
        TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 2));
        //隐私协议
        TAgreement three = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 1));
        //隐私协议
        TAgreement four = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 11));
        model.addAttribute("one",one);
        model.addAttribute("two",two);
        model.addAttribute("three",three);
        model.addAttribute("four",four);
        return PREFIX + "tAgreement.html";
    }


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

@@ -59,10 +59,10 @@
    @RequestMapping("")
    public String index(Model model) {
        //改派设置
        /*TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
        model.addAttribute("reformist",reformist);
        //积分设置
        TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
        /*TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
        model.addAttribute("integral",integral);*/
        //人脸识别
        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
@@ -134,9 +134,19 @@
                        @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
                        @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
                        @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3
            ,@RequestParam String res,@RequestParam String money
            ,@RequestParam String res,@RequestParam String money,@RequestParam Double one
    ) {

        //改派设置
        TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(reformist)){
            reformist.setMoney(new BigDecimal(one));
            tSysReformistService.updateById(reformist);
        }else{
            reformist = new TSysReformist();
            reformist.setCompanyId(ShiroKit.getUser().getObjectId());
            reformist.setMoney(new BigDecimal(one));
            tSysReformistService.insert(reformist);
        }
        //人脸识别
        TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
        if (SinataUtil.isNotEmpty(faceDistinguish)){

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java

@@ -95,7 +95,7 @@
                                                         @Param("orderCode") String orderCode, @Param("userPhone") String userPhone,
                                                         @Param("driverPhone") String driverPhone, @Param("createTimeStart") String createTimeStart,
                                                         @Param("createTimeEnd") String createTimeEnd, @Param("paymentTimeStart") String paymentTimeStart,
                                                         @Param("paymentTimeEnd") String paymentTimeEnd);
                                                         @Param("paymentTimeEnd") String paymentTimeEnd,@Param("orderType") Integer orderType);
    
    
    /**

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml

@@ -273,6 +273,7 @@
            d.phone as driverPhone,
            e.name as company,
            f.money as income,
            b.orderType as orderType,
            DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
            DATE_FORMAT(b.insertTime, '%Y-%m-%d %H:%i:%s') as paymentTime
        from t_order_taxi a
@@ -288,6 +289,9 @@
        <if test="null != orderCode and '' != orderCode">
            and a.orderNum like CONCAT('%', #{orderCode}, '%')
        </if>
        <if test="null != orderType">
            and b.orderType = #{orderType}
        </if>
        <if test="null != userPhone and '' != userPhone">
            and c.phone like CONCAT('%', #{userPhone}, '%')
        </if>

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java

@@ -90,7 +90,7 @@
     * @return
     */
    List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone,
                                                         String driverPhone, String createTime, String paymentTime);
                                                         String driverPhone, String createTime, String paymentTime,  Integer orderType);
    
    
    /**

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java

@@ -65,7 +65,8 @@
     * @return
     */
    @Override
    public List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone, String driverPhone, String createTime, String paymentTime) {
    public List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone,
                                                                String driverPhone, String createTime, String paymentTime,Integer orderType) {
        String createTimeStart = null;
        String createTimeEnd = null;
        String paymentTimeStart = null;
@@ -80,7 +81,7 @@
            paymentTimeStart = split[0];
            paymentTimeEnd = split[1];
        }
        return this.baseMapper.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, paymentTimeStart, paymentTimeEnd);
        return this.baseMapper.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, paymentTimeStart, paymentTimeEnd,orderType);
    }
    
    /**

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html

@@ -61,6 +61,10 @@
                            <h1 class="no-margins" id="orderDetail2">0</h1>
                            <small>出租车订单</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail3">0</h1>
                            <small>跨城出行订单</small>
                        </div>
                    </div>
                </div>
                <div class="col-sm-3">
@@ -116,6 +120,10 @@
                            <small>出租车订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="orderDetail31">0</h1>
                            <small>跨城出行订单数</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins" id="paiceSum1">0</h1>
                            <small>交易总金额</small>
                        </div>
@@ -149,6 +157,12 @@
                            </h1>
                            <small>出租车订单趋势图</small>
                        </div>
                        <div class="ibox-content">
                            <h1 class="no-margins">
                                <span class="dynamicsparkline" id="orderDetail32">Loading..</span>
                            </h1>
                            <small>跨城订单趋势图</small>
                        </div>
                    </div>
                </div>
            </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.html

@@ -28,6 +28,13 @@
                                <#TimeCon id="paymentTime" name="支付时间" isTime="false"/>
                            </div>
                            <div class="col-sm-3">
                            <#SelectCon id="orderType" name="订单类型" >
                                <option value="">全部</option>
                                <option value="2">出租车订单</option>
                                <option value="3">跨城出行订单</option>
                            </#SelectCon>
                        </div>
                            <div class="col-sm-3">
                                <#button name="搜索" icon="fa-search" clickFun="PaymentOrderStatistics.search()"/>
                                <#button name="重置" icon="fa-trash" clickFun="PaymentOrderStatistics.resetSearch()" space="true"/>
                            </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html

@@ -9,6 +9,7 @@
                            <div class="col-sm-3">
                                <#SelectCon id="type" name="类别" >
                                    <option value="2">出租车</option>
                                    <option value="3">跨城出行</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html

@@ -16,6 +16,7 @@
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="2">出租车券</option>
                                    <option value="3">跨城出行券</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html

@@ -16,6 +16,7 @@
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="2">出租车券</option>
                                    <option value="3">跨城出行券</option>
                                </#SelectCon>
                            </div>
                            <div class="col-sm-3">

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html

@@ -19,6 +19,7 @@
                    </div>
                    <#select id="couponUseType" name="服务类型" underline="true">
                        <option value="2">出租车券</option>
                        <option value="3">跨城出行券</option>
                    </#select>
                    <#input id="money" name="金额" underline="true" placeholder="最多4位数字"/>
                    <div class="form-group" id="fullMoneys" style="display: none">

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html

@@ -15,6 +15,7 @@
                                <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">注册协议</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
                                <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false">跨城出行须知</a></li>
                            </ul>
                            <div class="tab-content">
                                <div id="tab-1" class="tab-pane active">
@@ -47,6 +48,16 @@
                                        </div>
                                    </div>
                                </div>
                                <div id="tab-4" class="tab-pane">
                                    <div class="panel-body">
                                        <textarea type="text/plain" id="editor_4" style="width:1200px;height:400px;">${four.content}</textarea>
                                        <div class="row btn-group-m-t">
                                            <div class="col-sm-10 col-sm-offset-5">
                                                <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_4(${four.id});"/>
                                            </div>
                                        </div>
                                    </div>
                                </div>

                            </div>
                        </div>
@@ -61,11 +72,13 @@
    var editor_1 = null;
    var editor_2 = null;
    var editor_3 = null;
    var editor_4 = null;
    $(function () {
        //初始化编辑器
        editor_1 = UE.getEditor('editor_1');
        editor_2 = UE.getEditor('editor_2');
        editor_3 = UE.getEditor('editor_3');
        editor_4 = UE.getEditor('editor_4');
    });

    function update_1(id){
@@ -89,6 +102,13 @@
        }
        submitData($("#three").val(),id);
    }
    function update_4(id){
        if (editor_4.getContentTxt() == ""){
            Feng.error("内容不能为空!");
            return;
        }
        submitData(editor_4.getContent(),id);
    }

    function submitData(content,id) {
        //提交信息

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html

@@ -49,6 +49,10 @@
                                    <input type="checkbox" checked name="serverBox" id="serverBox2" value="2">
                                    <label for="serverBox2"> 出租车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="TCarInfoDlg.kcServerClick()">
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html

@@ -51,6 +51,10 @@
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
                                    <label for="serverBox2"> 出租车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="TCarInfoDlg.kcServerClick()">
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html

@@ -52,7 +52,12 @@
                                    <label for="checkbox2">
                                        出租车
                                    </label>

                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城出行
                                    </label>
                                </div>
                            </fieldset>
                        </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html

@@ -57,32 +57,12 @@
                                    <label for="checkbox2">
                                        出租车
                                    </label>
<!--                                    <fieldset>-->
<!--                                        <div class="row" style="display: none;" id="czDiv">-->
<!--                                            <div class="col-sm-6">-->
<!--                                                <div class="checkbox checkbox-circle">-->
<!--                                                    <input type="radio" name="cz" id="cz1" value="1" checked="">-->
<!--                                                    <label for="cz1">-->
<!--                                                        <div style="position: relative;top: -8px;">-->
<!--                                                            <span>按比例抽成,每笔订单抽取</span>-->
<!--                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent">-->
<!--                                                            <span>%</span>-->
<!--                                                        </div>-->
<!--                                                    </label>-->
<!--                                                </div>-->
<!--                                                <div class="checkbox checkbox-circle">-->
<!--                                                    <input type="radio" name="cz" id="cz2" value="2">-->
<!--                                                    <label for="cz2">-->
<!--                                                        <div style="position: relative;top: -8px;">-->
<!--                                                            <span>按固定金额抽成,每笔订单抽取</span>-->
<!--                                                            <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney">-->
<!--                                                            <span>元</span>-->
<!--                                                        </div>-->
<!--                                                    </label>-->
<!--                                                </div>-->
<!--                                            </div>-->
<!--                                        </div>-->
<!--                                    </fieldset>-->
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城
                                    </label>
                                </div>
                            </fieldset>
                        </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html

@@ -38,7 +38,12 @@
                                    <label for="checkbox2">
                                        出租车
                                    </label>

                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城
                                    </label>
                                </div>
                            </fieldset>
                        </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html

@@ -99,6 +99,12 @@
                                        出租车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
                                    <label for="checkbox3">
                                        跨城
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html

@@ -30,7 +30,12 @@
                                <label for="checkbox2">
                                    出租车
                                </label>

                            </div>
                            <div class="checkbox checkbox-success">
                                <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
                                <label for="checkbox3">
                                    跨城
                                </label>
                            </div>
                        </fieldset>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html

@@ -57,7 +57,12 @@
                                    <label for="checkbox2">
                                        出租车
                                    </label>

                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城
                                    </label>
                                </div>
                            </fieldset>
                        </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html

@@ -39,6 +39,12 @@
                                        出租车
                                    </label>
                                </div>
                                <div class="checkbox checkbox-success">
                                    <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
                                    <label for="checkbox3">
                                        跨城
                                    </label>
                                </div>
                            </fieldset>
                        </div>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html

@@ -74,6 +74,10 @@
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2">
                                    <label for="serverBox2"> 出租车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html

@@ -77,6 +77,10 @@
                                    <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
                                    <label for="serverBox2"> 出租车 </label>
                                </div>
                                <div class="checkbox checkbox-success  checkbox-inline">
                                    <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.checkBox()" >
                                    <label for="serverBox3"> 跨城 </label>
                                </div>
                            </div>
                        </fieldset>
                    </div>

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html

@@ -27,6 +27,7 @@
                            <select class="form-control" id="businessType">
                                <option value="">选择经营业务</option>
                                <option value="2">出租车</option>
                                <option value="3">跨城出行</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html

@@ -34,6 +34,7 @@
                            <select class="form-control" id="businessType">
                                <option value="">选择经营业务</option>
                                <option value="2">出租车</option>
                                <option value="3">跨城出行</option>
                            </select>
                        </div>
                        <div class="col-sm-3" >

 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html

@@ -13,7 +13,7 @@
                        <h3>系统设置:</h3>
                    </div>

                    <!--<div class="form-group">
                    <div class="form-group">
                        <label class="col-sm-2 control-label">改派设置：</label>
                        <div class="col-sm-10">
                            改派费用为&nbsp;<input type="text" oninput="checkIsDouble(this)"
@@ -26,7 +26,7 @@
                        </div>
                    </div>

                    <div class="form-group">
                    <!--<div class="form-group">
                        <label class="col-sm-2 control-label">积分设置：</label>
                        <div class="col-sm-10">
                            消费一元积&nbsp;<input type="text" oninput="checkIsInt(this)"
@@ -459,6 +459,7 @@
            }
        });
        var openValue = $("#openValue").val();
        var one = $("#one").val().trim();
        var czc1 = $("#czc1").val().trim();
        var czc2 = $("#czc2").val().trim();
        var czc3 = $("#czc3").val().trim();
@@ -477,13 +478,13 @@

        if (
            "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
            || "" == phone1 || "" == phone2 ) {
            || "" == phone1 || "" == phone2 || "" == one) {
            Feng.info("输入框不能为空!");
            return;
        } else if (
             !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
            || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
            || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
            || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)|| !regDouble.test(one)
                ) {
            Feng.info("格式不正确!");
            return ;
@@ -496,6 +497,7 @@
        },function(data){
            Feng.error("操作失败!" + data.responseJSON.message + "!");
        });
        ajax.set("one", one);
        ajax.set("czc1", czc1);
        ajax.set("czc2", czc2);
        ajax.set("czc3", czc3);

 ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js

@@ -17,6 +17,15 @@
        {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
        {title: '支付流水号', field: 'paymentCode', visible: true, align: 'center', valign: 'middle'},
        {title: '订单号', field: 'orderNum', visible: true, align: 'center', valign: 'middle'},
        {title: '订单类型', field: 'orderType', visible: true, align: 'center', valign: 'middle',
            formatter: function (value, row) {
                if(row.orderType == 2) {
                    return '出租车订单';
                } else {
                    return '跨城出行订单';
                }
            }
        },
        {title: '支付用户手机号', field: 'userPhone', visible: true, align: 'center', valign: 'middle'},
        {title: '支付金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
        {title: '接单司机手机号', field: 'driverPhone', visible: true, align: 'center', valign: 'middle'},
@@ -85,8 +94,9 @@
    let driverPhone = $("#driverPhone").val();
    let createTime = $("#createTime").val();
    let paymentTime = $("#paymentTime").val();
    let orderType = $("#orderType").val();
    window.location.href = Feng.ctxPath + '/financialStatement/paymentOrderStatisticsList_export?paymentCode=' + paymentCode + "&orderCode=" + orderCode +
            "&userPhone=" + userPhone + "&driverPhone=" + driverPhone + "&createTime=" + createTime + "&paymentTime=" + paymentTime
            "&userPhone=" + userPhone + "&driverPhone=" + driverPhone + "&createTime=" + createTime + "&paymentTime=" + paymentTime + "&orderType=" + orderType
}


@@ -102,6 +112,7 @@
    queryData['driverPhone'] = $("#driverPhone").val();
    queryData['createTime'] = $("#createTime").val();
    queryData['paymentTime'] = $("#paymentTime").val();
    queryData['orderType'] = $("#orderType").val();
    PaymentOrderStatistics.table.refresh({query: queryData});
};

@@ -113,6 +124,7 @@
    $("#driverPhone").val("");
    $("#createTime").val("");
    $("#paymentTime").val("");
    $("#orderType").val("");
    PaymentOrderStatistics.search();
};