DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java
@@ -310,15 +310,9 @@ String retCode = jsonObject.getString("retCode"); if (!"0".equals(retCode)) { log.error("【身份证实名认证】请求失败:" + result); return null; throw new RuntimeException("【身份证实名认证】请求失败:" + result); } JSONObject object = jsonObject.getJSONObject("object"); String status = object.getString("status"); if (!"0".equals(status)) { log.error("【身份证实名认证】失败:" + object.toJSONString()); return null; } JSONArray data = object.getJSONArray("data"); return true; return object.getBoolean("isok"); } } ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -46,18 +46,18 @@ <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> </div> <!-- <div class="ibox-content">--> <!-- <h1 class="no-margins" id="orderDetail3">0</h1>--> <!-- <small>跨城出行订单</small>--> <!-- </div>--> <div class="ibox-content"> <h1 class="no-margins" id="orderDetail3">0</h1> <small>跨城出行订单</small> </div> <!-- <div class="ibox-content">--> <!-- <h1 class="no-margins" id="orderDetail4">0</h1>--> <!-- <small>同城小件物流订单</small>--> @@ -116,18 +116,18 @@ <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> </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="orderDetail31">0</h1> <small>跨城出行订单数</small> </div> <!-- <div class="ibox-content">--> <!-- <h1 class="no-margins" id="orderDetail41">0</h1>--> <!-- <small>同城小件物流订单数</small>--> @@ -164,24 +164,24 @@ </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> </h1> <small>出租车订单趋势图</small> </div> <!-- <div class="ibox-content">--> <!-- <h1 class="no-margins">--> <!-- <span class="dynamicsparkline" id="orderDetail32">Loading..</span>--> <!-- </h1>--> <!-- <small>跨城出行订单趋势图</small>--> <!-- </div>--> <div class="ibox-content"> <h1 class="no-margins"> <span class="dynamicsparkline" id="orderDetail32">Loading..</span> </h1> <small>跨城出行订单趋势图</small> </div> <!-- <div class="ibox-content">--> <!-- <h1 class="no-margins">--> <!-- <span class="dynamicsparkline" id="orderDetail42">Loading..</span>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/order.html
@@ -32,9 +32,9 @@ <div class="col-sm-3"> <#SelectCon id="type" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城物流</option>--> <!-- <option value="5">跨城物流</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfIncomeDetails.html
@@ -24,9 +24,9 @@ <div class="col-sm-3"> <#SelectCon id="type" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城物流</option>--> <!-- <option value="5">跨城物流</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/incomeDetail/summaryOfSpendingDetails.html
@@ -24,9 +24,9 @@ <div class="col-sm-3"> <#SelectCon id="type" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城物流</option>--> <!-- <option value="5">跨城物流</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/merchantActivity/merchantActivity_add.html
@@ -40,9 +40,9 @@ <div class="col-sm-10 " style="width: 630px"> <select data-style="btn-primary" title="请选择服务类型" class="selectpicker form-control " id="orderType" multiple> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城-小件物流</option>--> <!-- <option value="5">跨城-小件物流</option>--> </select> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -9,8 +9,8 @@ <div class="col-sm-3"> <#SelectCon id="type" name="类别" > <option value="2">出租车</option> <!-- <option value="1">快车</option>--> <!-- <option value="3">跨城</option>--> <option value="1">快车</option> <option value="3">跨城</option> <!-- <option value="4">小件物流</option>--> </#SelectCon> </div> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/report/order.html
@@ -23,9 +23,9 @@ <div class="col-sm-3"> <#SelectCon id="type" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城物流</option>--> <!-- <option value="5">跨城物流</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/hasCollectOrderDetail.html
@@ -20,9 +20,9 @@ <div class="col-sm-2"> <#SelectCon id="orderType" name="订单类型"> <option value="">请选择</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">跨城出行</option>--> <option value="3">跨城出行</option> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> <!-- <option value="6">95128电召</option>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/noCollectOrderDetail.html
@@ -20,7 +20,7 @@ <div class="col-sm-2"> <#SelectCon id="orderType" name="订单类型"> <option value="">请选择</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">95128电召</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/spendingDetailPlatform/orderRevenueDetails.html
@@ -18,9 +18,9 @@ <div class="col-sm-3"> <#SelectCon id="orderType" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">城际</option>--> <option value="3">城际</option> <!-- <option value="4">同城物流</option>--> <!-- <option value="5">跨城物流</option>--> </#SelectCon> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -45,18 +45,18 @@ <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="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> </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 class="checkbox checkbox-success checkbox-inline"> <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="TCarInfoDlg.kcServerClick()"> <label for="serverBox3"> 跨城出行 </label> </div> <!-- <div class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4">--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> @@ -72,7 +72,6 @@ </div> </fieldset> </div> <!-- <div class="form-group" style="display: none;" id="zcModelDiv"> <label class="col-sm-3 control-label">快车车型：</label> <div class="col-sm-9"> @@ -95,7 +94,6 @@ </select> </div> </div> --> <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">选择车辆品牌</option> @for(obj in brandList){ ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -47,18 +47,18 @@ <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="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> </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 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 class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> @@ -74,7 +74,6 @@ </div> </fieldset> </div> <!-- <div class="form-group" id="zcModelDiv"> <label class="col-sm-3 control-label">快车车型：</label> <div class="col-sm-9"> @@ -97,7 +96,6 @@ </select> </div> </div> --> <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)"> <option value="">选择车辆品牌</option> @for(obj in brandList){ ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -61,17 +61,17 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>--> <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"> 快车 </label> <fieldset> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea> <!-- </fieldset>--> <!-- </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"> @@ -84,12 +84,12 @@ </div> </fieldset> </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>--> <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> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox4()">--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -48,20 +48,20 @@ <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">--> <!-- 快车--> <!-- </label>--> <div class="checkbox checkbox-success"> <input id="checkbox1" name="checkbox" onclick="TCompanyInfoDlg.checkbox1()" type="checkbox" value="1"> <label for="checkbox1"> 快车 </label> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" ></textarea>--> <fieldset> <div class="row" id="zcDiv" style="display: none;"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/> <textarea cols="50" hidden="hidden" id="Spe" rows="5" ></textarea> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> </div> </fieldset> </div> <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="TCompanyInfoDlg.checkbox2()"> <label for="checkbox2"> @@ -75,12 +75,12 @@ </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>--> <div class="checkbox checkbox-success"> <input id="checkbox3" name="checkbox" onclick="TCompanyInfoDlg.checkbox3()" type="checkbox" value="3"> <label for="checkbox3"> 跨城出行 </label> </div> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="TCompanyInfoDlg.checkbox4()">--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -28,18 +28,18 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" ></textarea>--> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()"> <label for="checkbox1"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" ></textarea> </div> </fieldset> </div> <div class="checkbox checkbox-primary"> <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="FranchiseeInfoDlg.checkbox2()"> <label for="checkbox2"> @@ -52,12 +52,12 @@ </div> </fieldset> </div> <!-- <div class="checkbox checkbox-success">--> <!-- <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()">--> <!-- <label for="checkbox3">--> <!-- 跨城出行--> <!-- </label>--> <!-- </div>--> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()"> <label for="checkbox3"> 跨城出行 </label> </div> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="FranchiseeInfoDlg.checkbox4()">--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -89,19 +89,19 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>--> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" type="checkbox" disabled value="1" ${1 == item.isSpe ? 'checked=checked' : ''} > <label for="checkbox1"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> </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"> @@ -114,12 +114,12 @@ </div> </fieldset> </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>--> <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> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''}>--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -20,19 +20,19 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>--> <div class="checkbox checkbox-success"> <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} > <label for="checkbox1"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set2('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> </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"> @@ -45,12 +45,12 @@ </div> </fieldset> </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>--> <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> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -48,19 +48,19 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>--> <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"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> </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"> @@ -73,12 +73,12 @@ </div> </fieldset> </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>--> <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> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox4()">--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -28,18 +28,18 @@ <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">--> <!-- 快车--> <!-- </label>--> <!-- <fieldset>--> <!-- <div class="row" style="display: none;" id="zcDiv">--> <!-- <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/>--> <!-- <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea>--> <!-- </div>--> <!-- </fieldset>--> <!-- </div>--> <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"> 快车 </label> <fieldset> <div class="row" style="display: none;" id="zcDiv"> <#button btnCss="info" name="设置司机抽成" id="Spe1" icon="fa-check" clickFun="TLineInfoDlg.set1('Spe')"/> <textarea id="Spe" rows="5" cols="50" hidden="hidden" value="${item.Spe}">${item.Spe}</textarea> </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"> @@ -52,12 +52,12 @@ </div> </fieldset> </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>--> <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> <!-- <div class="checkbox checkbox-info">--> <!-- <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">--> <!-- <label for="checkbox4">--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -72,18 +72,18 @@ <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 id="serverBox1" name="serverBox" type="checkbox" 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> </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 class="checkbox checkbox-success checkbox-inline"> <input id="serverBox3" name="serverBox" onclick="YesDriverInfoDlg.checkBox()" type="checkbox" value="3" > <label for="serverBox3"> 跨城出行 </label> </div> <!-- <div class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4">--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -75,18 +75,18 @@ <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> </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 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 class="checkbox checkbox-success checkbox-inline">--> <!-- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>--> <!-- <label for="serverBox4"> 小件物流-同城 </label>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -26,9 +26,9 @@ <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="3">跨城出行</option> <!-- <option value="4">跨城小件物流</option>--> <!-- <option value="5">同城小件物流</option>--> <!-- <option value="6">包车</option>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -33,9 +33,9 @@ <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="3">跨城出行</option> <!-- <option value="4">跨城小件物流</option>--> <!-- <option value="5">同城小件物流</option>--> <!-- <option value="6">包车</option>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -30,9 +30,9 @@ <div class="col-sm-3"> <#SelectCon id="orderType" name="订单类型" > <option value="">全部</option> <!-- <option value="1">快车</option>--> <option value="1">快车</option> <option value="2">出租车</option> <!-- <option value="3">跨城出行</option>--> <option value="3">跨城出行</option> <!-- <option value="4">跨城小件物流</option>--> <!-- <option value="5">同城小件物流</option>--> <!-- <option value="6">包车</option>--> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -59,7 +59,6 @@ </div> <div style="float: left;width: 1200px;margin-left: 50px;"> <div class="pushOrderSettings"> <!-- <div class="form-group"> <label class="col-sm-2 control-label">快车推单：</label> <div class="col-sm-10"> @@ -133,7 +132,6 @@ <br/> </div> </div> --> <div class="form-group"> <label class="col-sm-2 control-label">出租车推单：</label> <div class="col-sm-10"> @@ -238,7 +236,6 @@ <div class="form-group"> <label class="col-sm-2 control-label">取消设置：</label> <div class="col-sm-10"> <!-- 快车订单取消规则：快车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(ptCancel1)){ value="${ptCancel1.minuteNum}" @@ -254,7 +251,6 @@ @} name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用； <br/> --> <br/> 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(ptCancel2)){ @@ -271,7 +267,6 @@ @} name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用； <br/> <!-- <br/> 跨城出行取消规则：跨城订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(ptCancel3)){ @@ -288,7 +283,6 @@ @} name="ptCancel6" id="ptCancel6" class="form-control newWidth" /> 元取消费用； <br/> --> </div> </div> @@ -302,7 +296,6 @@ <div class="form-group"> <label class="col-sm-2 control-label">预约单取消设置：</label> <div class="col-sm-10"> <!-- 快车订单取消规则：快车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(yyCancel1)){ value="${yyCancel1.minuteNum}" @@ -318,7 +311,6 @@ @} name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用； <br/> --> <br/> 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)" @if(isNotEmpty(yyCancel2)){ @@ -441,7 +433,6 @@ @} name="one" id="one" class="form-control newWidth" /> 元；<br/> </div> <!-- <div class="col-sm-3"> <label class="col-sm-5 control-label">快车改派：</label> <div class="col-sm-7"> @@ -456,7 +447,6 @@ </div> </div> </div> --> <div class="col-sm-3"> <label class="col-sm-5 control-label">出租车改派：</label> <div class="col-sm-7"> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCardAudit_detail.html
@@ -89,62 +89,62 @@ <label class="control-label">天</label> </div> <div id="changeModel"> <!-- <div id="couponsModel">--> <!-- <div class="form-group">--> <!-- <label class="col-sm-2 control-label">送</label>--> <!-- <div class="col-sm-1">--> <!-- <input class="form-control" id="coupons1">--> <!-- </div>--> <!-- <input type="hidden" name="couponsCount">--> <!-- <label class="col-sm-1" style="top: 6px">张，优惠</label>--> <!-- <div class="col-sm-2" style="margin-left: -50px">--> <!-- <input class="form-control" id="couponss1">--> <!-- </div>--> <!-- <div class="col-sm-1">--> <!-- <select class="form-control" id="couponsss1">--> <!-- <option value="1">元</option>--> <!-- <option value="2">折</option>--> <!-- </select>--> <!-- </div>--> <!-- <div class="col-sm-2">--> <!-- <select class="form-control" id="couponssss1">--> <!-- <option value="0">无门槛</option>--> <!-- <option value="1">快车</option>--> <!-- <option value="2">出租车</option>--> <!-- <option value="3">跨城出行</option>--> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> <!-- </select>--> <!-- </div>--> <!-- <label class="col-sm-1" style="top: 6px">优惠券</label>--> <!-- <div class="col-sm-1">--> <!-- <span style="font-size: 20px;top: 6px" class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()"></span>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <div id="couponsModel"> <div class="form-group"> <label class="col-sm-2 control-label">送</label> <div class="col-sm-1"> <input class="form-control" id="coupons1"> </div> <input name="couponsCount" type="hidden"> <label class="col-sm-1" style="top: 6px">张，优惠</label> <div class="col-sm-2" style="margin-left: -50px"> <input class="form-control" id="couponss1"> </div> <div class="col-sm-1"> <select class="form-control" id="couponsss1"> <option value="1">元</option> <option value="2">折</option> </select> </div> <div class="col-sm-2"> <select class="form-control" id="couponssss1"> <option value="0">无门槛</option> <option value="1">快车</option> <option value="2">出租车</option> <option value="3">跨城出行</option> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> </select> </div> <label class="col-sm-1" style="top: 6px">优惠券</label> <div class="col-sm-1"> <span class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()" style="font-size: 20px;top: 6px"></span> </div> </div> </div> </div> <div id="timeDuring"> <!-- <div class="form-group">--> <!-- <label class="col-sm-2 control-label">使用时间段</label>--> <!-- <div class="col-sm-2">--> <!-- <div class="layui-inline">--> <!-- <div class="layui-input-inline">--> <!-- <input type="text" class="layui-input" id="startTime1" placeholder="开始时间">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <input type="hidden" name="timeCount">--> <!-- <div class="col-sm-2">--> <!-- <div class="layui-inline">--> <!-- <div class="layui-input-inline">--> <!-- <input type="text" class="layui-input" id="endTime1" placeholder="结束时间">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <div class="col-sm-1">--> <!-- <span style="font-size: 20px;top: 8px" class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addTimeDuring()"></span>--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-2 control-label">使用时间段</label> <div class="col-sm-2"> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" id="startTime1" placeholder="开始时间" type="text"> </div> </div> </div> <input name="timeCount" type="hidden"> <div class="col-sm-2"> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" id="endTime1" placeholder="结束时间" type="text"> </div> </div> </div> <div class="col-sm-1"> <span class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addTimeDuring()" style="font-size: 20px;top: 8px"></span> </div> </div> </div> <div id="discountModel" hidden> <div class="form-group"> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_add.html
@@ -71,39 +71,39 @@ <label class="control-label">天</label> </div> <div id="changeModel"> <!-- <div id="couponsModel">--> <!-- <div class="form-group">--> <!-- <label class="col-sm-2 control-label">送</label>--> <!-- <div class="col-sm-1">--> <!-- <input class="form-control" id="coupons1">--> <!-- </div>--> <!-- <input type="hidden" name="couponsCount">--> <!-- <label class="col-sm-1" style="top: 6px">张，优惠</label>--> <!-- <div class="col-sm-2" style="margin-left: -50px">--> <!-- <input class="form-control" id="couponss1">--> <!-- </div>--> <!-- <div class="col-sm-1">--> <!-- <select class="form-control" id="couponsss1">--> <!-- <option value="1">元</option>--> <!-- <option value="2">折</option>--> <!-- </select>--> <!-- </div>--> <!-- <div class="col-sm-2">--> <!-- <select class="form-control" id="couponssss1">--> <!-- <option value="0">无门槛</option>--> <!-- <option value="1">快车</option>--> <!-- <option value="2">出租车</option>--> <!-- <option value="3">跨城出行</option>--> <div id="couponsModel"> <div class="form-group"> <label class="col-sm-2 control-label">送</label> <div class="col-sm-1"> <input class="form-control" id="coupons1"> </div> <input name="couponsCount" type="hidden"> <label class="col-sm-1" style="top: 6px">张，优惠</label> <div class="col-sm-2" style="margin-left: -50px"> <input class="form-control" id="couponss1"> </div> <div class="col-sm-1"> <select class="form-control" id="couponsss1"> <option value="1">元</option> <option value="2">折</option> </select> </div> <div class="col-sm-2"> <select class="form-control" id="couponssss1"> <option value="0">无门槛</option> <option value="1">快车</option> <option value="2">出租车</option> <option value="3">跨城出行</option> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> <!-- </select>--> <!-- </div>--> <!-- <label class="col-sm-1" style="top: 6px">优惠券</label>--> <!-- <div class="col-sm-1">--> <!-- <span style="font-size: 20px;top: 6px" class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()"></span>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> </select> </div> <label class="col-sm-1" style="top: 6px">优惠券</label> <div class="col-sm-1"> <span class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()" style="font-size: 20px;top: 6px"></span> </div> </div> </div> </div> <div id="timeDuring"> <div class="form-group"> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tTaxiCard/tTaxiCard_edit.html
@@ -89,62 +89,62 @@ <label class="control-label">天</label> </div> <div id="changeModel"> <!-- <div id="couponsModel">--> <!-- <div class="form-group">--> <!-- <label class="col-sm-2 control-label">送</label>--> <!-- <div class="col-sm-1">--> <!-- <input class="form-control" id="coupons1">--> <!-- </div>--> <!-- <input type="hidden" name="couponsCount">--> <!-- <label class="col-sm-1" style="top: 6px">张，优惠</label>--> <!-- <div class="col-sm-2" style="margin-left: -50px">--> <!-- <input class="form-control" id="couponss1">--> <!-- </div>--> <!-- <div class="col-sm-1">--> <!-- <select class="form-control" id="couponsss1">--> <!-- <option value="1">元</option>--> <!-- <option value="2">折</option>--> <!-- </select>--> <!-- </div>--> <!-- <div class="col-sm-2">--> <!-- <select class="form-control" id="couponssss1">--> <!-- <option value="0">无门槛</option>--> <!-- <option value="1">快车</option>--> <!-- <option value="2">出租车</option>--> <!-- <option value="3">跨城出行</option>--> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> <!-- </select>--> <!-- </div>--> <!-- <label class="col-sm-1" style="top: 6px">优惠券</label>--> <!-- <div class="col-sm-1">--> <!-- <span style="font-size: 20px;top: 6px" class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()"></span>--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <div id="couponsModel"> <div class="form-group"> <label class="col-sm-2 control-label">送</label> <div class="col-sm-1"> <input class="form-control" id="coupons1"> </div> <input name="couponsCount" type="hidden"> <label class="col-sm-1" style="top: 6px">张，优惠</label> <div class="col-sm-2" style="margin-left: -50px"> <input class="form-control" id="couponss1"> </div> <div class="col-sm-1"> <select class="form-control" id="couponsss1"> <option value="1">元</option> <option value="2">折</option> </select> </div> <div class="col-sm-2"> <select class="form-control" id="couponssss1"> <option value="0">无门槛</option> <option value="1">快车</option> <option value="2">出租车</option> <option value="3">跨城出行</option> <!-- <option value="4">同城小件物流</option>--> <!-- <option value="5">跨城小件物流</option>--> </select> </div> <label class="col-sm-1" style="top: 6px">优惠券</label> <div class="col-sm-1"> <span class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addCouponsDuring()" style="font-size: 20px;top: 6px"></span> </div> </div> </div> </div> <div id="timeDuring"> <!-- <div class="form-group">--> <!-- <label class="col-sm-2 control-label">使用时间段</label>--> <!-- <div class="col-sm-2">--> <!-- <div class="layui-inline">--> <!-- <div class="layui-input-inline">--> <!-- <input type="text" class="layui-input" id="startTime1" placeholder="开始时间">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <input type="hidden" name="timeCount">--> <!-- <div class="col-sm-2">--> <!-- <div class="layui-inline">--> <!-- <div class="layui-input-inline">--> <!-- <input type="text" class="layui-input" id="endTime1" placeholder="结束时间">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <div class="col-sm-1">--> <!-- <span style="font-size: 20px;top: 8px" class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addTimeDuring()"></span>--> <!-- </div>--> <!-- </div>--> <div class="form-group"> <label class="col-sm-2 control-label">使用时间段</label> <div class="col-sm-2"> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" id="startTime1" placeholder="开始时间" type="text"> </div> </div> </div> <input name="timeCount" type="hidden"> <div class="col-sm-2"> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" id="endTime1" placeholder="结束时间" type="text"> </div> </div> </div> <div class="col-sm-1"> <span class="glyphicon glyphicon-plus" onclick="TTaxiCardInfoDlg.addTimeDuring()" style="font-size: 20px;top: 8px"></span> </div> </div> </div> <div id="discountModel" hidden> <div class="form-group"> ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
@@ -82,13 +82,13 @@ </div> <div class="row"> <div class="col-sm-6"> <!-- <#label id="zcNum" name="快车" value="${item.zcNum}"/>--> <#label id="zcNum" name="快车" value="${item.zcNum}"/> <#label id="czNum" name="出租车" value="${item.czNum}"/> <#label id="consumptionStr" name="历史消费" value="¥${item.consumptionNum}"/> <#label id="integral" name="积分" value="${item.integral}"/> </div> <div class="col-sm-6"> <!-- <#label id="kcNum" name="跨城出行" value="${item.kcNum}"/>--> <#label id="kcNum" name="跨城出行" value="${item.kcNum}"/> <!-- <#label id="wlNum" name="小件物流" value="${item.wlNum}"/>--> <#label id="balance" name="钱包余额" value="¥${item.balanceStr}"/> @if(item.state == 1){ UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -22,16 +22,92 @@ public static void main(String[] args) { CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); request.setScene(QianYunTongProperties.sceneId); request.setPartnerId("522700"); request.setOrderNo("123456"); request.setCustomerId("11448156"); request.setDriverId("11448158"); request.setSupplierShopId("981100006005951"); request.setServiceType(1); String travelItinerary = createTravelItinerary(request); System.err.println(travelItinerary); //创建行程 // CreateTravelItineraryRequest request = new CreateTravelItineraryRequest(); // request.setScene("TRAFFIC"); // request.setPartnerId("522700"); // request.setOrderNo("123456"); // request.setCustomerId("11448156"); // request.setDriverId("11448158"); // request.setSupplierShopId("981100006005951"); // request.setServiceType(1); // String travelItinerary = createTravelItinerary(request); // System.err.println(travelItinerary);//1948565171253956608 //修改行程状态 // ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest(); // request.setScene("TRAFFIC"); // request.setPartnerId("522700"); // request.setOrderId("1948565171253956608"); // request.setStatus(7); // request.setDriverId("11448158"); // request.setSupplierShopId("981100006005951"); // Boolean aBoolean = modifyTravelItinerary(request); //订单创建及拉起支付 // TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData(); // tradeOrderCreateData.setScene("TRAFFIC"); // tradeOrderCreateData.setPartnerId("522700"); // tradeOrderCreateData.setTreatShopId("11448158"); // tradeOrderCreateData.setOrderAppId("52270015"); // tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"0\"}"); // tradeOrderCreateData.setCharge(new BigDecimal("0.01")); // tradeOrderCreateData.setChannelSource("GRJYCXWXXCX"); // tradeOrderCreateData.setOrderId("1948565171253956608"); // tradeOrderCreateData.setOrderNo("123456"); // tradeOrderCreateData.setCustomerId("11448156"); // tradeOrderCreateData.setPayPartnerId("5400004"); // tradeOrderCreateData.setPartnerPayId("1948565171253956608"); // tradeOrderCreateData.setCurrency("RMB"); // tradeOrderCreateData.setTotalFee("1"); // tradeOrderCreateData.setRetUrl("/home/"); // tradeOrderCreateData.setClientIp("127.0.0.1"); // tradeOrderCreateData.setNeedLoginFlag("N"); // tradeOrderCreateData.setOrderDesc("出行订单支付"); // tradeOrderCreateData.setAccessMode("H5"); // // List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); // GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); // goodsInfoRequest.setId("1"); // goodsInfoRequest.setSubAppId(QianYunTongProperties.appId); // goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ"); // goodsInfoRequest.setProfitSharing("1"); // goodsInfo.add(goodsInfoRequest); // tradeOrderCreateData.setGoodsInfo(goodsInfo); // TradeOrderCreate tradeOrderCreate = tradeOrderCreate1(tradeOrderCreateData); // System.err.println(tradeOrderCreate); // //TradeOrderCreate(orderInfo=OrderInfo(orderId=1948565171253956608, status=null), payInfo=PayInfo(retCode=000000, retMsg=success, success=true, data=PayInfoData(redirectUrl=https://qhsctest.qytzt.cn/gray/mobile/index.html?f=allCashDesk&accessToken=5nUBXayFpfZz%2FXUZiMu9LyWg15VM5hbmhIjUt0hdmws%3D, payId=540000420250725000135518, status=null, payTime=null, payFee=null, paymentInfos=null), sign=ea01f3b186be02e43367b856fd2ec699)) //查询支付单信息 // GetPaymentInfoDataRequest getPaymentInfoDataRequest = new GetPaymentInfoDataRequest(); // getPaymentInfoDataRequest.setPartnerId("5400004"); // getPaymentInfoDataRequest.setPartnerPayId("1948565171253956608"); // GetPaymentInfo getPaymentInfo = paymentInfo(getPaymentInfoDataRequest); // System.err.println(getPaymentInfo); //拉起支付 TradePayOff1Data tradePayOff1Data = new TradePayOff1Data(); tradePayOff1Data.setPartnerId("5400004"); tradePayOff1Data.setScene("TRAFFIC"); tradePayOff1Data.setPartnerPayId("1948565171253956608"); tradePayOff1Data.setCurrency("RMB"); tradePayOff1Data.setTotalFee("1"); tradePayOff1Data.setRetUrl("/home/"); tradePayOff1Data.setClientIp("127.0.0.1"); tradePayOff1Data.setNeedLoginFlag("N"); tradePayOff1Data.setOrderDesc("出行订单支付"); tradePayOff1Data.setAccessMode("H5"); List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); goodsInfoRequest.setId("1"); goodsInfoRequest.setSubAppId(QianYunTongProperties.appId); goodsInfoRequest.setSubOpenId("oVLur6yFtED8ruXBWUFKXjzXJ_BQ"); goodsInfoRequest.setProfitSharing("1"); goodsInfo.add(goodsInfoRequest); tradePayOff1Data.setGoodsInfo(goodsInfo); PayInfo payInfo = tradePayOff1(tradePayOff1Data); System.err.println(payInfo); // CreateOrderRequest createOrderRequest = new CreateOrderRequest(); // createOrderRequest.setTreatShopId(""); @@ -48,22 +124,21 @@ } /** * 订单创建 * @param createOrderRequest * 拉起支付 * * @param tradePayOff1Data * @return */ public static OrderInfo tradeOrderCreate(CreateOrderRequest createOrderRequest){ TradeRequest request = new TradeRequest<CreateOrderRequest>(); request.setSceneId(QianYunTongProperties.sceneId); request.setAppId(QianYunTongProperties.appId); public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) { TradeRequest request = new TradeRequest<TradePayOff1Data>(); request.setSceneId("1911676727023968256"); request.setAppId(QianYunTongProperties.appkey); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); request.setData(createOrderRequest); request.setData(tradePayOff1Data); //请求路径 String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradeOrderCreate"; String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradePayOff"; //私钥文件 String skprivateKeyFile = QianYunTongProperties.privateKeyPath; //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 @@ -81,19 +156,19 @@ contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName); contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status); contentMap.put("content", new Gson().toJson(request)); log.info("【订单创建】请求地址:" + url); log.info("【订单创建】请求参数:" + JSON.toJSONString(contentMap)); log.info("【拉起支付】请求地址:" + url); log.info("【拉起支付】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【订单创建】请求结果:" + result); log.info("【拉起支付】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if(!"000000".equals(resCode)){ log.error("【订单创建】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单创建】失败:" + jsonObject.getString("resMsg")); if (!"000000".equals(resCode)) { log.error("【拉起支付】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【拉起支付】失败:" + jsonObject.getString("resMsg")); } JSONObject busiResp = jsonObject.getJSONObject("busiResp"); OrderInfo orderInfo = busiResp.getObject("orderInfo", OrderInfo.class); return orderInfo; PayInfo payInfo = busiResp.getObject("payInfo", PayInfo.class); return payInfo; } /** @@ -227,18 +302,16 @@ return listPage; } /** * 订单创建及拉起支付 * * @param tradeOrderCreateData * @return */ public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData){ public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData) { TradeRequest request = new TradeRequest<TradeOrderCreateData>(); request.setSceneId(QianYunTongProperties.sceneId); request.setAppId(QianYunTongProperties.appId); request.setSceneId("1945688132719169536"); request.setAppId(QianYunTongProperties.appkey); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); request.setData(tradeOrderCreateData); @@ -268,7 +341,7 @@ log.info("【订单创建及拉起支付】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if(!"000000".equals(resCode)){ if (!"000000".equals(resCode)) { log.error("【订单创建及拉起支付】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单创建及拉起支付】失败:" + jsonObject.getString("resMsg")); } @@ -276,16 +349,63 @@ return busiResp; } /** * 订单创建 * * @param createOrderRequest * @return */ public static OrderInfo tradeOrderCreate(CreateOrderRequest createOrderRequest) { TradeRequest request = new TradeRequest<CreateOrderRequest>(); request.setSceneId(QianYunTongProperties.sceneId); request.setAppId(QianYunTongProperties.appkey); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); request.setData(createOrderRequest); //请求路径 String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradeOrderCreate"; //私钥文件 String skprivateKeyFile = QianYunTongProperties.privateKeyPath; //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = QianYunTongProperties.appkey;//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUIDUtil.getRandomCode(); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName); contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status); contentMap.put("content", new Gson().toJson(request)); log.info("【订单创建】请求地址:" + url); log.info("【订单创建】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【订单创建】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if (!"000000".equals(resCode)) { log.error("【订单创建】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【订单创建】失败:" + jsonObject.getString("resMsg")); } JSONObject busiResp = jsonObject.getJSONObject("busiResp"); OrderInfo orderInfo = busiResp.getObject("orderInfo", OrderInfo.class); return orderInfo; } /** * （补偿单）拉起支付 * * @param tradePayOffData * @return */ public static PayInfo tradePayOff(TradePayOffData tradePayOffData){ public static PayInfo tradePayOff(TradePayOffData tradePayOffData) { TradeRequest request = new TradeRequest<TradePayOffData>(); request.setSceneId(QianYunTongProperties.sceneId); request.setAppId(QianYunTongProperties.appId); request.setAppId(QianYunTongProperties.appkey); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); request.setData(tradePayOffData); @@ -314,56 +434,9 @@ log.info("【（补偿单）拉起支付】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if(!"000000".equals(resCode)){ if (!"000000".equals(resCode)) { log.error("【（补偿单）拉起支付】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【（补偿单）拉起支付】失败:" + jsonObject.getString("resMsg")); } JSONObject busiResp = jsonObject.getJSONObject("busiResp"); PayInfo payInfo = busiResp.getObject("payInfo", PayInfo.class); return payInfo; } /** * 拉起支付 * @param tradePayOff1Data * @return */ public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data){ TradeRequest request = new TradeRequest<TradePayOff1Data>(); request.setSceneId(QianYunTongProperties.sceneId); request.setAppId(QianYunTongProperties.appId); request.setConfigVersion(1); request.setRequestId(UUIDUtil.getRandomCode()); request.setData(tradePayOff1Data); //请求路径 String url = QianYunTongProperties.apiUrl + "/openapi/rest/1.0/tradePayOff"; //私钥文件 String skprivateKeyFile = QianYunTongProperties.privateKeyPath; //注意：私钥文件需要开发者手动新建.pem文件，将委办局提供的私钥串复制进文件里用于sign加密 String appKey = QianYunTongProperties.appkey;//appkey Map<String, String> headers = new HashMap<>(); headers.put("Content-Type", "application/json"); Map<String, Object> contentMap = new HashMap<String, Object>(); Date nowdate = new Date(); SimpleDateFormat date = new SimpleDateFormat("yyyyMMddHHmmss"); String timeStamp = date.format(nowdate); String messageId = UUIDUtil.getRandomCode(); contentMap.put(SystemParameterNames.getAppKey(), appKey); contentMap.put(SystemParameterNames.getMessage_id(), messageId); contentMap.put(SystemParameterNames.getUserName(), QianYunTongProperties.userName); contentMap.put(SystemParameterNames.getStatus(), QianYunTongProperties.status); contentMap.put("content", new Gson().toJson(request)); log.info("【拉起支付】请求地址:" + url); log.info("【拉起支付】请求参数:" + JSON.toJSONString(contentMap)); String result = OpenApiClient.sendCommonHttpRequst(url, headers, "POST", skprivateKeyFile, timeStamp, contentMap); log.info("【拉起支付】请求结果:" + result); JSONObject jsonObject = JSON.parseObject(result); String resCode = jsonObject.getString("resCode"); if(!"000000".equals(resCode)){ log.error("【拉起支付】失败:" + jsonObject.getString("resMsg")); throw new RuntimeException("【拉起支付】失败:" + jsonObject.getString("resMsg")); } JSONObject busiResp = jsonObject.getJSONObject("busiResp"); PayInfo payInfo = busiResp.getObject("payInfo", PayInfo.class);
