ManagementOKTravel/guns-admin/sql/basepro2018011116.sql
File was deleted ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -223,57 +223,57 @@ tSysPushOrderService.insert(zcThree); } //出租车推单(第一轮) TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1)); if (SinataUtil.isNotEmpty(czcOne)){ czcOne.setPushDistance(czc1); czcOne.setPushTime(czc2); czcOne.setDriverProportion(czc3); tSysPushOrderService.updateById(czcOne); }else{ czcOne = new TSysPushOrder(); czcOne.setPushDistance(czc1); czcOne.setPushTime(czc2); czcOne.setDriverProportion(czc3); czcOne.setCompanyId(ShiroKit.getUser().getObjectId()); czcOne.setPushType(2); czcOne.setType(1); tSysPushOrderService.insert(czcOne); } //出租车推单(第二轮) TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2)); if (SinataUtil.isNotEmpty(czcTwo)){ czcTwo.setPushDistance(czc4); czcTwo.setPushTime(czc5); czcTwo.setDriverProportion(czc6); tSysPushOrderService.updateById(czcTwo); }else{ czcTwo = new TSysPushOrder(); czcTwo.setPushDistance(czc4); czcTwo.setPushTime(czc5); czcTwo.setDriverProportion(czc6); czcTwo.setCompanyId(ShiroKit.getUser().getObjectId()); czcTwo.setPushType(2); czcTwo.setType(2); tSysPushOrderService.insert(czcTwo); } //出租车推单(第三轮) TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3)); if (SinataUtil.isNotEmpty(czcThree)){ czcThree.setPushDistance(czc7); czcThree.setPushTime(czc8); czcThree.setDriverProportion(czc9); tSysPushOrderService.updateById(czcThree); }else{ czcThree = new TSysPushOrder(); czcThree.setPushDistance(czc7); czcThree.setPushTime(czc8); czcThree.setDriverProportion(czc9); czcThree.setCompanyId(ShiroKit.getUser().getObjectId()); czcThree.setPushType(2); czcThree.setType(3); tSysPushOrderService.insert(czcThree); } // //出租车推单(第一轮) // TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1)); // if (SinataUtil.isNotEmpty(czcOne)){ // czcOne.setPushDistance(czc1); // czcOne.setPushTime(czc2); // czcOne.setDriverProportion(czc3); // tSysPushOrderService.updateById(czcOne); // }else{ // czcOne = new TSysPushOrder(); // czcOne.setPushDistance(czc1); // czcOne.setPushTime(czc2); // czcOne.setDriverProportion(czc3); // czcOne.setCompanyId(ShiroKit.getUser().getObjectId()); // czcOne.setPushType(2); // czcOne.setType(1); // tSysPushOrderService.insert(czcOne); // } // //出租车推单(第二轮) // TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2)); // if (SinataUtil.isNotEmpty(czcTwo)){ // czcTwo.setPushDistance(czc4); // czcTwo.setPushTime(czc5); // czcTwo.setDriverProportion(czc6); // tSysPushOrderService.updateById(czcTwo); // }else{ // czcTwo = new TSysPushOrder(); // czcTwo.setPushDistance(czc4); // czcTwo.setPushTime(czc5); // czcTwo.setDriverProportion(czc6); // czcTwo.setCompanyId(ShiroKit.getUser().getObjectId()); // czcTwo.setPushType(2); // czcTwo.setType(2); // tSysPushOrderService.insert(czcTwo); // } // //出租车推单(第三轮) // TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3)); // if (SinataUtil.isNotEmpty(czcThree)){ // czcThree.setPushDistance(czc7); // czcThree.setPushTime(czc8); // czcThree.setDriverProportion(czc9); // tSysPushOrderService.updateById(czcThree); // }else{ // czcThree = new TSysPushOrder(); // czcThree.setPushDistance(czc7); // czcThree.setPushTime(czc8); // czcThree.setDriverProportion(czc9); // czcThree.setCompanyId(ShiroKit.getUser().getObjectId()); // czcThree.setPushType(2); // czcThree.setType(3); // tSysPushOrderService.insert(czcThree); // } //普通取消设置(专车) TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1)); ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -55,26 +55,26 @@ --- spring: profiles: local datasource: url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: oktravel password: Si8bnm5KPGSZkF3F db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat #spring: # profiles: local # datasource: # url: jdbc:mysql://127.0.0.1:3306/kytravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8 # username: root # password: 123456 # db-name: oktravel #用来搜集数据库的所有表 # url: jdbc:mysql://127.0.0.1:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai # username: oktravel # password: Si8bnm5KPGSZkF3F # db-name: guns #用来搜集数据库的所有表 # filters: wall,mergeStat spring: profiles: local datasource: url: jdbc:mysql://127.0.0.1:3306/kytravel?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8 username: root password: 123456 db-name: oktravel #用来搜集数据库的所有表 filters: wall,mergeStat #多数据源情况的配置 guns: ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -46,10 +46,10 @@ <h1 class="no-margins" id="newNetcardriver">0</h1> <small>在线司机</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins" id="orderDetail1">0</h1>--> <!--<small>专车订单数</small>--> <!--</div>--> <div class="ibox-content"> <h1 class="no-margins" id="orderDetail1">0</h1> <small>专车订单数</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins" id="orderDetail2">0</h1>--> <!--<small>出租车订单</small>--> @@ -116,10 +116,10 @@ <h1 class="no-margins" id="netcarDriverSum1">0</h1> <small>新增司机</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins" id="orderDetail11">0</h1>--> <!--<small>专车订单数</small>--> <!--</div>--> <div class="ibox-content"> <h1 class="no-margins" id="orderDetail11">0</h1> <small>专车订单数</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins" id="orderDetail21">0</h1>--> <!--<small>出租车订单数</small>--> @@ -164,12 +164,12 @@ </h1> <small>用户注册趋势图</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins">--> <!--<span class="dynamicsparkline" id="orderDetail12">Loading..</span>--> <!--</h1>--> <!--<small>专车订单趋势图</small>--> <!--</div>--> <div class="ibox-content"> <h1 class="no-margins"> <span class="dynamicsparkline" id="orderDetail12">Loading..</span> </h1> <small>专车订单趋势图</small> </div> <!--<div class="ibox-content">--> <!--<h1 class="no-margins">--> <!--<span class="dynamicsparkline" id="orderDetail22">Loading..</span>--> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -30,11 +30,11 @@ <br/> 司机APP每天累计在线奖励 <br/> <!-- <br/> 专车累计在线 <input type="text" id="num4" class="form-control newWidth" /> 小时奖励 <input type="text" id="num5" class="form-control newWidth" /> 元 <br/> <!-- <br/> 出租车累计在线 <input type="text" id="num6" class="form-control newWidth" /> 小时奖励 <input type="text" id="num7" class="form-control newWidth" /> 元 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -40,7 +40,6 @@ <br/> 司机APP每天累计在线奖励 <br/> <!-- <br/> 专车累计在线 <input type="text" @if(isNotEmpty(online1)){ value="${online1.online}" @@ -55,6 +54,7 @@ @} name="zc7" class="form-control newWidth" readonly/> 元 <br/> <!-- <br/> 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){ value="${online2.online}" ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -41,7 +41,6 @@ <br/> 司机APP每天累计在线奖励 <br/> <!-- <br/> 专车累计在线 <input type="text" @if(isNotEmpty(online1)){ value="${online1.online}" @@ -56,6 +55,7 @@ @} name="zc7" id="num5" class="form-control newWidth"/> 元 <br/> <!-- <br/> 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){ value="${online2.online}" ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -121,7 +121,6 @@ <h4><a href="#" onclick="driverActivityHistory(2,${id2})">领取列表</a></h4> </div> </div> <!-- <div class="col-sm-3"> <div class="ibox float-e-margins"> <div class="ibox-title"> @@ -134,6 +133,7 @@ <h4><a href="#" onclick="driverActivityHistory(3,${id3})">领取列表</a></h4> </div> </div> <!-- <div class="col-sm-3"> <div class="ibox float-e-margins"> <div class="ibox-title"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -11,10 +11,8 @@ <div class="row"> <div class="col-sm-3"> <#SelectCon id="type" name="类别" > <!-- <option value="2">出租车</option> <!--<option value="2">出租车</option>--> <option value="1">专车</option> --> <option value="3">跨城</option> <option value="4">小件物流</option> </#SelectCon> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -16,7 +16,7 @@ <#SelectCon id="couponUseType" name="优惠券类型" > <option value="">全部</option> <option value="0">通用券</option> <!--<option value="1">专车券</option>--> <option value="1">专车券</option> <!--<option value="2">出租车券</option>--> <option value="3">跨城出行券</option> </#SelectCon> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
@@ -16,7 +16,7 @@ <#SelectCon id="couponUseType" name="优惠券类型" > <option value="">全部</option> <option value="0">通用券</option> <!--<option value="1">专车券</option>--> <option value="1">专车券</option> <!--<option value="2">出租车券</option>--> <option value="3">跨城出行券</option> </#SelectCon> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
@@ -18,7 +18,7 @@ </div> </div> <#select id="couponUseType" name="服务类型" underline="true"> <!--<option value="1">专车券</option>--> <option value="1">专车券</option> <!--<option value="2">出租车券</option>--> <option value="3">跨城出行券</option> <option value="0">通用券</option> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -45,11 +45,11 @@ <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> <!-- <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 专车 </label> </div> <!-- <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox2" value="2"> <label for="serverBox2"> 出租车 </label> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -47,11 +47,11 @@ <fieldset> <label class="col-sm-3 control-label">服务模式：</label> <div class="col-sm-9"> <!-- <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()"> <label for="serverBox1"> 专车 </label> </div> <!-- <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}> <label for="serverBox2"> 出租车 </label> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -47,7 +47,6 @@ <label class="col-sm-2 control-label">经营业务：</label> <div class="col-sm-10"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -88,6 +87,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()"> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -47,7 +47,6 @@ <label class="col-sm-2 control-label">经营业务：</label> <div class="col-sm-10"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="TCompanyInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -80,6 +79,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="TCompanyInfoDlg.checkbox2()"> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -28,7 +28,6 @@ <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -61,6 +60,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="FranchiseeInfoDlg.checkbox2()"> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -88,7 +88,6 @@ <label class="col-sm-2 control-label">经营业务：</label> <div class="col-sm-10"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" disabled value="1" ${1 == item.isSpe ? 'checked=checked' : ''} > <label for="checkbox1"> @@ -129,6 +128,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} > <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -20,7 +20,6 @@ <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} > <label for="checkbox1"> @@ -61,6 +60,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''}> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -47,7 +47,6 @@ <label class="col-sm-2 control-label">经营业务：</label> <div class="col-sm-10"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -88,6 +87,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()"> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -28,7 +28,6 @@ <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <fieldset> <!-- <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()"> <label for="checkbox1"> @@ -69,6 +68,7 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()"> <label for="checkbox2"> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -70,10 +70,10 @@ <fieldset> <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <!--<div class="checkbox checkbox-success checkbox-inline">--> <!--<input type="checkbox" name="serverBox" id="serverBox1" value="1">--> <!--<label for="serverBox1"> 专车 </label>--> <!--</div>--> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1"> <label for="serverBox1"> 专车 </label> </div> <!--<div class="checkbox checkbox-success checkbox-inline">--> <!--<input type="checkbox" name="serverBox" id="serverBox2" value="2">--> <!--<label for="serverBox2"> 出租车 </label>--> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -73,10 +73,10 @@ <fieldset> <label class="col-sm-3 control-label">经营业务：</label> <div class="col-sm-9"> <!--<div class="checkbox checkbox-success checkbox-inline">--> <!--<input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}>--> <!--<label for="serverBox1"> 专车 </label>--> <!--</div>--> <div class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}> <label for="serverBox1"> 专车 </label> </div> <!--<div class="checkbox checkbox-success checkbox-inline">--> <!--<input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>--> <!--<label for="serverBox2"> 出租车 </label>--> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -26,7 +26,7 @@ <div class="col-sm-3"> <select class="form-control" id="businessType"> <option value="">选择经营业务</option> <!--<option value="1">专车</option>--> <option value="1">专车</option> <!--<option value="2">出租车</option>--> <option value="3">跨城出行</option> <option value="4">跨城小件物流</option> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -33,7 +33,7 @@ <div class="col-sm-3"> <select class="form-control" id="businessType"> <option value="">选择经营业务</option> <!--<option value="1">专车</option>--> <option value="1">专车</option> <!--<option value="2">出租车</option>--> <option value="3">跨城出行</option> <option value="4">跨城小件物流</option> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -30,8 +30,8 @@ <div class="col-sm-3"> <#SelectCon id="orderType" name="订单类型" > <option value="">全部</option> <!-- <option value="1">专车</option> <!-- <option value="2">出租车</option> --> <option value="3">跨城出行</option> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -67,8 +67,6 @@ </div> </div> </div> <!-- <div class="form-group"> <label class="col-sm-2 control-label">专车改派：</label> <div class="col-sm-10"> @@ -84,6 +82,7 @@ </div> </div> <!-- <div class="form-group"> <label class="col-sm-2 control-label">出租车改派：</label> <div class="col-sm-10"> @@ -250,6 +249,7 @@ <br/> </div> </div> --> <div class="form-group"> <label class="col-sm-2 control-label">取消设置：</label> <div class="col-sm-10"> @@ -268,6 +268,7 @@ @} name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用； <br/> <!-- <br/> 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(ptCancel2)){ @@ -284,6 +285,7 @@ @} name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用； <br/> --> </div> </div> <div class="form-group"> @@ -304,6 +306,7 @@ @} name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用； <br/> <!-- <br/> 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(yyCancel2)){ @@ -320,9 +323,9 @@ @} name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用； <br/> </div> </div> --> </div> </div> <div class="form-group"> <label class="col-sm-2 control-label">电话设置：</label> <div class="col-sm-10"> @@ -440,37 +443,37 @@ var zc8 = $("#zc8").val().trim(); var zc9 = $("#zc9").val().trim(); var czc1 = $("#czc1").val().trim(); var czc2 = $("#czc2").val().trim(); var czc3 = $("#czc3").val().trim(); var czc4 = $("#czc4").val().trim(); var czc5 = $("#czc5").val().trim(); var czc6 = $("#czc6").val().trim(); var czc7 = $("#czc7").val().trim(); var czc8 = $("#czc8").val().trim(); var czc9 = $("#czc9").val().trim(); // var czc1 = $("#czc1").val().trim(); // var czc2 = $("#czc2").val().trim(); // var czc3 = $("#czc3").val().trim(); // var czc4 = $("#czc4").val().trim(); // var czc5 = $("#czc5").val().trim(); // var czc6 = $("#czc6").val().trim(); // var czc7 = $("#czc7").val().trim(); // var czc8 = $("#czc8").val().trim(); // var czc9 = $("#czc9").val().trim(); var ptCancel1 = $("#ptCancel1").val().trim(); var ptCancel2 = $("#ptCancel2").val().trim(); var ptCancel3 = $("#ptCancel3").val().trim(); var ptCancel4 = $("#ptCancel4").val().trim(); // var ptCancel3 = $("#ptCancel3").val().trim(); // var ptCancel4 = $("#ptCancel4").val().trim(); // var ptCancel5 = $("#ptCancel5").val().trim(); // var ptCancel6 = $("#ptCancel6").val().trim(); var yyCancel1 = $("#yyCancel1").val().trim(); var yyCancel2 = $("#yyCancel2").val().trim(); var yyCancel3 = $("#yyCancel3").val().trim(); var yyCancel4 = $("#yyCancel4").val().trim(); // var yyCancel3 = $("#yyCancel3").val().trim(); // var yyCancel4 = $("#yyCancel4").val().trim(); var phone1 = $("#phone1").val().trim(); var phone2 = $("#phone2").val().trim(); var phone3 = $("#phone3").val().trim(); // var phone3 = $("#phone3").val().trim(); if ("" == one || "" == two || "" == three || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9 || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9 || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/ || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4 /*|| "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9*/ || "" == ptCancel1 || "" == ptCancel2 /*|| "" == ptCancel3 || "" == ptCancel4 || "" == ptCancel5 || "" == ptCancel6*/ || "" == yyCancel1 || "" == yyCancel2 /*|| "" == yyCancel3 || "" == yyCancel4*/ || "" == phone1 || "" == phone2 ) { Feng.info("输入框不能为空!"); return; @@ -488,12 +491,12 @@ || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6) || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9) || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3) /*|| !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)*/ || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/ || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) { || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) || !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/ || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) /*|| !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)*/) { Feng.info("格式不正确!"); return ; } @@ -527,31 +530,31 @@ ajax.set("zc8", zc8); ajax.set("zc9", zc9); ajax.set("czc1", czc1); ajax.set("czc2", czc2); ajax.set("czc3", czc3); ajax.set("czc4", czc4); ajax.set("czc5", czc5); ajax.set("czc6", czc6); ajax.set("czc7", czc7); ajax.set("czc8", czc8); ajax.set("czc9", czc9); ajax.set("czc1", 0); ajax.set("czc2", 0); ajax.set("czc3", 0); ajax.set("czc4", 0); ajax.set("czc5", 0); ajax.set("czc6", 0); ajax.set("czc7", 0); ajax.set("czc8", 0); ajax.set("czc9", 0); ajax.set("ptCancel1", ptCancel1); ajax.set("ptCancel2", ptCancel2); ajax.set("ptCancel3", ptCancel3); ajax.set("ptCancel4", ptCancel4); ajax.set("ptCancel3", 0); ajax.set("ptCancel4", 0); ajax.set("ptCancel5", 0); ajax.set("ptCancel6", 0); ajax.set("yyCancel1", yyCancel1); ajax.set("yyCancel2", yyCancel2); ajax.set("yyCancel3", yyCancel3); ajax.set("yyCancel4", yyCancel4); ajax.set("yyCancel3", 0); ajax.set("yyCancel4", 0); ajax.set("phone1", phone1); ajax.set("phone2", phone2); ajax.set("phone3", phone3); ajax.set("phone3", 0); ajax.start(); } ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
@@ -83,8 +83,8 @@ </div> <div class="row"> <div class="col-sm-6"> <!-- <#label id="zcNum" name="专车" value="${item.zcNum}"/> <!-- <#label id="czNum" name="出租车" value="${item.czNum}"/> --> <#label id="consumptionStr" name="历史消费" value="¥${item.consumptionNum}"/> ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html
@@ -36,12 +36,12 @@ <input type="text" name="zc1" id="num2" class="form-control newWidth" /> 张 <input type="text" name="zc1" id="num3" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(0)"/> 元通用优惠券 <br/> <!-- <br/> 送 <input type="text" name="zc1" id="num4" class="form-control newWidth" /> 张 <input type="text" name="zc1" id="num5" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(1)"/> 元专车优惠券 <br/> <!-- <br/> 送 <input type="text" name="zc1" id="num6" class="form-control newWidth" /> 张 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
@@ -274,9 +274,9 @@ {title: '通用券领取总数', field: 'number', visible: true, align: 'center', valign: 'middle'}, {title: '通用券使用总数', field: 'useNumber', visible: true, align: 'center', valign: 'middle'}, {title: '通用券使用总金额', field: 'useMoney', visible: true, align: 'center', valign: 'middle'}, // {title: '专车券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'}, // {title: '专车券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'}, // {title: '专车券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'}, {title: '专车券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'}, {title: '专车券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'}, {title: '专车券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'}, // {title: '出租车券领取总数', field: 'taxiNumber', visible: true, align: 'center', valign: 'middle'}, // {title: '出租车券使用总数', field: 'taxiUseNumber', visible: true, align: 'center', valign: 'middle'}, // {title: '出租车券使用总金额', field: 'taxiUserMoney', visible: true, align: 'center', valign: 'middle'}, ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -155,8 +155,8 @@ <th style="width: 300px;">最高金额</th> <th style="width: 300px;">通用券金额</th> <th style="width: 300px;">通用券数量</th> <!--<th style="width: 300px;">专车券金额</th>--> <!--<th style="width: 300px;">专车券数量</th>--> <th style="width: 300px;">专车券金额</th> <th style="width: 300px;">专车券数量</th> <!--<th style="width: 400px;">出租车券金额</th>--> <!--<th style="width: 400px;">出租车券数量</th>--> <th style="width: 300px;">城际金额</th> @@ -182,12 +182,12 @@ <br/> 启用： <input type="checkbox" id="content5Check" class="js-switch2" checked=""> <br/> <!-- <br/> 专车活动打折： <input type="text" name="zc1" id="content5Num1" class="form-control newWidth" /> 折 <br/> <!-- <br/> 出租车活动打折： ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
@@ -266,8 +266,8 @@ <th style="width: 300px;">最高金额</th> <th style="width: 300px;">通用券金额</th> <th style="width: 300px;">通用券数量</th> <!--<th style="width: 300px;">专车券金额</th>--> <!--<th style="width: 300px;">专车券数量</th>--> <th style="width: 300px;">专车券金额</th> <th style="width: 300px;">专车券数量</th> <!--<th style="width: 400px;">出租车券金额</th>--> <!--<th style="width: 400px;">出租车券数量</th>--> <th style="width: 300px;">城际金额</th> @@ -313,7 +313,6 @@ @} type="checkbox" id="content5Check" class="js-switch2"> <br/> <!-- <br/> 专车活动打折： @@ -325,6 +324,7 @@ @} name="zc1" id="content5Num1" class="form-control newWidth" readonly/> <br/> <!-- <br/> 出租车活动打折： ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -274,8 +274,8 @@ <th style="width: 300px;">最高金额</th> <th style="width: 300px;">通用券金额</th> <th style="width: 300px;">通用券数量</th> <!--<th style="width: 300px;">专车券金额</th>--> <!--<th style="width: 300px;">专车券数量</th>--> <th style="width: 300px;">专车券金额</th> <th style="width: 300px;">专车券数量</th> <!--<th style="width: 400px;">出租车券金额</th>--> <!--<th style="width: 400px;">出租车券数量</th>--> <th style="width: 300px;">城际金额</th> @@ -323,7 +323,6 @@ @} type="checkbox" id="content5Check" class="js-switch2"> <br/> <!-- <br/> 专车活动打折： @@ -335,6 +334,7 @@ @} name="zc1" id="content5Num1" class="form-control newWidth" /> <br/> <!-- <br/> 出租车活动打折：
