management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -56,6 +56,9 @@ @Autowired private ITRegionService tRegionService; @Autowired private ITDriverService tDriverService; /** * 跳转到首页 @@ -195,6 +198,18 @@ tAgent.setStatus(1); } tAgentService.updateById(tAgent); // 冻结下面所有的司机 List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>() .eq("agentId", id)); for (TDriver tDriver : list) { if(1 == status){ tDriver.setStatus(2); } if(2 == status){ tDriver.setStatus(1); } } tDriverService.updateBatchById(list); return SUCCESS_TIP; }
@@ -57,7 +57,6 @@ <if test="roleType != null and roleType == 3"> AND o.agentId = #{objectId} </if> AND co.userType = 1 </where> ORDER BY co.createTime </select> management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -1,7 +1,8 @@ package com.stylefeng.guns.modular.system.util; public class PushURL { public static String zull_user_url = "http://127.0.0.1:81"; // public static String zull_user_url = "http://127.0.0.1:81"; public static String zull_user_url = "https://okyueche.com:443"; public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState"; public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms"; public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit"; management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -860,11 +860,8 @@ var allList; if(e==""){ allList = $('#allList').val(); console.log(1111111111) var list = JSON.stringify(allList) console.log(2222222222) const jsonArray = JSON.parse(list) console.log(3333333333333) const jsonArray1 = JSON.parse(jsonArray); console.log(jsonArray1) M = jsonArray1; management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStop.html
@@ -9,10 +9,12 @@ <input hidden id="status" value="${status}"> <div class="col-lg-3"> @if(status==1){ 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>冻结理由:</label><br/><br/> <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 680px; height: 200px;" required></textarea> @} @if(status==2){ 启用理由:<textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>启用理由:</label><br/><br/> <textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 680px; height: 200px;" required></textarea> @} </div> <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="margin-left:300px"> management/guns-admin/src/main/webapp/WEB-INF/view/system/tAppUser/tAppUserStartAndStopException.html
@@ -9,10 +9,12 @@ <input hidden id="status" value="${status}"> <div class="col-lg-3"> @if(status==1){ 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>冻结理由:</label><br/><br/> <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} @if(status==2){ 启用理由:<textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>启用理由:</label><br/><br/> <textarea id="startRemark" placeholder="请输入启用理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} </div> <div class="hidden-xs" id="TAppUserTableToolbar" role="group" style="margin-left:300px"> management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaAdd.html
@@ -25,7 +25,7 @@ </select> </div> <div class="col-sm-4 control-label"> <label class="col-sm-1" style="width: 20px;">区:</label> <label class="col-sm-1" style="width: 20px;">区/县:</label> <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option value="">请选择</option> @for(district in districtList){ management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeAreaUpdate.html
@@ -31,7 +31,7 @@ </select> </div> <div class="col-sm-4 control-label"> <label class="col-sm-1" style="width: 20px;">区:</label> <label class="col-sm-1" style="width: 20px;">区/县:</label> <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -39,7 +39,7 @@ @if(shiro.hasPermission("/tDriver/rechargeBalancePage")){ <#button name="充值" icon="fa-edit" clickFun="TDriver.rechargeBalancePage()"/> @} @if(shiro.hasPermission("/tAgent/add")){ @if(shiro.hasPermission("/tDriver/add")){ <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/> @} </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaAdd.html
@@ -25,7 +25,7 @@ </select> </div> <div class="col-sm-4 control-label"> <label class="col-sm-1" style="width: 20px;">区:</label> <label class="col-sm-1" style="width: 20px;">区/县:</label> <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverAreaUpdate.html
@@ -31,7 +31,7 @@ </select> </div> <div class="col-sm-4 control-label"> <label class="col-sm-1" style="width: 20px;">区:</label> <label class="col-sm-1" style="width: 20px;">区/县:</label> <select class="input-group col-sm-2" id="district" style="width: 200px;height: 33px" name="district"> <option>请选择</option> @for(district in districtList){ management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html
@@ -65,11 +65,11 @@ <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <label class="control-label" >身份证正面照:</label> <label class="control-label" >身份证正面照:</label><br/> <img src="${idcardFront}" style="height: 100px;width: 100px"/> </div> <div class="initialLevel col-sm-2 control-label form-group" > <label class="control-label">身份证背面照:</label> <label class="control-label">身份证背面照:</label><br/> <img src="${idcardBack}" style="height: 100px;width: 100px"/> </div> </div> management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverExceptionStartAndStop.html
@@ -9,10 +9,12 @@ <input hidden id="status" value="${status}"> <div class="col-lg-3"> @if(status==1){ 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>冻结理由:</label><br/><br/> <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} @if(status==2){ 解冻理由:<textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>解冻理由:</label><br/><br/> <textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} </div> <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="margin-left:300px"> management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverStartAndStop.html
@@ -9,10 +9,12 @@ <input hidden id="status" value="${status}"> <div class="col-lg-3"> @if(status==1){ 冻结理由:<textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>冻结理由:</label><br/><br/> <textarea id="stopRemark" placeholder="请输入冻结理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} @if(status==2){ 解冻理由:<textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 249px;"></textarea> <label>解冻理由:</label><br/><br/> <textarea id="startRemark" placeholder="请输入解冻理由" maxlength="200" style="width: 681px; height: 200px;" required></textarea> @} </div> <div class="hidden-xs" id="TDriverTableToolbar" role="group" style="margin-left:300px"> management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -35,23 +35,23 @@ <div class="initialLevel col-sm-3 control-label form-group" > <span style="color:red">*</span> <label class="control-label" >紧急联系人姓名:</label> <input id="emergencyContact" name="emergencyContact" value="${item.emergencyContact}" type="text" maxlength="20" style="height: 30px" required> <input id="emergencyContact" name="emergencyContact" value="${item.emergencyContact}" type="text" maxlength="20" style="height: 30px" required disabled> </div> <div class="initialLevel col-sm-3 control-label form-group" > <span style="color:red">*</span> <label class="control-label" >紧急联系人电话:</label> <input id="emergencyPhone" name="emergencyPhone" value="${item.emergencyPhone}" type="number" maxlength="11" style="height: 30px" required> <input id="emergencyPhone" name="emergencyPhone" value="${item.emergencyPhone}" type="number" maxlength="11" style="height: 30px" required disabled> </div> </div> <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <label class="control-label" >邀约人姓名:</label> <input id="inviterName" value="${item.inviterName}" type="text" maxlength="20" style="height: 30px"> <input id="inviterName" value="${item.inviterName}" type="text" maxlength="20" style="height: 30px" disabled> </div> <div class="initialLevel col-sm-3 control-label form-group" > <label class="control-label" >邀约人电话:</label> <input id="inviterPhone" value="${item.inviterPhone}" type="number" maxlength="11" style="height: 30px"> <input id="inviterPhone" value="${item.inviterPhone}" type="number" maxlength="11" style="height: 30px" disabled> </div> </div> @@ -77,28 +77,64 @@ <div class="initialLevel col-sm-3 control-label form-group" > <span style="color:red">*</span> <label class="control-label" >身份证号码:</label> <input id="idcard" name="idcard" value="${item.idcard}" type="text" maxlength="20" style="height: 30px" required> <input id="idcard" name="idcard" value="${item.idcard}" type="text" maxlength="20" style="height: 30px" required disabled> </div> </div> <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <!-- <div class="initialLevel col-sm-3 control-label form-group" >--> <!-- <span style="color:red">*</span>--> <!-- <label class="control-label" >身份证正面照:</label>--> <!-- <#uploadImg id="idcardFront" fileImg="${item.idcardFront}"/>--> <!-- </div>--> <div class="initialLevel col-sm-3 control-label form-group"> <span style="color:red">*</span> <label class="control-label" >身份证正面照:</label> <#uploadImg id="idcardFront" fileImg="${item.idcardFront}"/> <label class="control-label">身份证正面照:</label> <div class="form-group"> <div class="col-sm-4"> <div id="idcardFrontPreId"> <div><img width="100px" height="100px" src="${item.idcardFront}"> </div> </div> </div> </div> </div> <div class="initialLevel col-sm-3 control-label form-group" > <!-- <div class="initialLevel col-sm-3 control-label form-group" >--> <!-- <span style="color:red">*</span>--> <!-- <label class="control-label" >身份证背面照:</label>--> <!-- <#uploadImg id="idcardBack" fileImg="${item.idcardBack}"/>--> <!-- </div>--> <div class="initialLevel col-sm-3 control-label form-group"> <span style="color:red">*</span> <label class="control-label" >身份证背面照:</label> <#uploadImg id="idcardBack" fileImg="${item.idcardBack}"/> <label class="control-label">身份证背面照:</label> <div class="form-group"> <div class="col-sm-4"> <div id="idcardBackPreId"> <div><img width="100px" height="100px" src="${item.idcardBack}"> </div> </div> </div> </div> </div> </div> <div class="initialLevel col-sm-12 control-label form-group" > <div class="initialLevel col-sm-3 control-label form-group" > <!-- <div class="initialLevel col-sm-3 control-label form-group" >--> <!-- <span style="color:red">*</span>--> <!-- <label class="control-label" >驾驶证:</label>--> <!-- <#uploadImg id="driverLicense" fileImg="${item.driverLicense}"/>--> <!-- </div>--> <div class="initialLevel col-sm-3 control-label form-group"> <span style="color:red">*</span> <label class="control-label" >驾驶证:</label> <#uploadImg id="driverLicense" fileImg="${item.driverLicense}"/> <label class="control-label">驾驶证:</label> <div class="form-group"> <div class="col-sm-4"> <div id="driverLicensePreId"> <div><img width="100px" height="100px" src="${item.driverLicense}"> </div> </div> </div> </div> </div> </div> </div> management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
@@ -151,22 +151,32 @@ * 提交启用冻结 */ TAppUser.updateStatus = function () { var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) { Feng.success("修改成功!"); TAppUserInfoDlg.close(); parent.TAppUser.table.refresh(); }, function (data) { Feng.error("修改失败!" + data.responseJSON.message + "!"); }); ajax.set("id",$("#id").val()); ajax.set("status",$("#status").val()); if($("#status").val() == 1){ ajax.set("remark",$("#stopRemark").val()); } if($("#status").val() == 2){ ajax.set("remark",$("#startRemark").val()); } ajax.start(); var status = $("#status").val(); if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){ Feng.info("请输入冻结理由!") return; } if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){ Feng.info("请输入启用理由!") return; } var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) { Feng.success("修改成功!"); TAppUserInfoDlg.close(); parent.TAppUser.table.refresh(); }, function (data) { Feng.error("修改失败!" + data.responseJSON.message + "!"); }); ajax.set("id",$("#id").val()); ajax.set("status",$("#status").val()); if($("#status").val() == 1){ ajax.set("remark",$("#stopRemark").val()); } if($("#status").val() == 2){ ajax.set("remark",$("#startRemark").val()); } ajax.start(); }; /** management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
@@ -129,6 +129,16 @@ * 提交启用冻结 */ TAppUserException.updateStatus = function () { var status = $("#status").val(); if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){ Feng.info("请输入冻结理由!") return; } if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){ Feng.info("请输入启用理由!") return; } var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) { Feng.success("修改成功!"); TAppUserInfoDlg.closeException(); management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -192,6 +192,18 @@ * 提交启用冻结 */ TDriver.updateStatus = function () { var status = $("#status").val(); console.log(status) if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){ Feng.info("请输入冻结理由!") return; } if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){ Feng.info("请输入解冻理由!") return; } var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) { Feng.success("修改成功!"); TDriverInfoDlg.close(); @@ -300,6 +312,12 @@ * 提交审核 */ TDriver.auditSubmit = function () { if($("#approvalStatus").val() == 3 && ($("#approvalNotes").val() == '' || $("#approvalNotes").val() == null)){ Feng.info("请输入驳回原因!"); return; } var ajax = new $ax(Feng.ctxPath + "/tDriver/auditSubmit", function (data) { Feng.success("修改成功!"); TDriverInfoDlg.close(); management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriverException.js
@@ -155,6 +155,17 @@ * 提交启用冻结 */ TDriverException.updateStatus = function () { var status = $("#status").val(); if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){ Feng.info("请输入冻结理由!") return; } if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){ Feng.info("请输入解冻理由!") return; } var ajax = new $ax(Feng.ctxPath + "/tDriver/update-status", function (data) { Feng.success("修改成功!"); TDriverInfoDlg.closeException();
