cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java
@@ -82,16 +82,16 @@ operatorAuth.setRefuseReason(substring); operatorAuthService.updateById(operatorAuth); // 获取运营商的管理员id Integer operatorId = operatorAuth.getOperatorId(); User one = userService.getOne(new QueryWrapper<User>().eq("objectId", operatorId) .eq("objectType", 2)); /** * 状态 1=审核中(AUDITING)、2=待联系人确认（CONTACT_CONFIRM）， * 3=待法人确认（LEGAL_CONFIRM）、4=审核通过(AUDIT_PASS)、 * 5=审核失败(AUDIT_REJECT)、6=已冻结(AUDIT_FREEZE)、 * 7=已撤回(CANCELED)、8=联系人处理中(CONTACT_PROCESSING) */ // 失败修改审核状态 } Integer operatorId = operatorAuth.getOperatorId(); User one = userService.getOne(new QueryWrapper<User>().eq("objectId", operatorId) .eq("objectType", 2)); OperatorUser userId = operatorUserService.getOne(new QueryWrapper<OperatorUser>() .eq("userId", one.getId())); if (userId!=null){ @@ -122,10 +122,6 @@ break; } operatorUserService.updateById(userId); } } // 审核通过 String qr_code = sign.getString("qr_code"); cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -169,8 +169,16 @@ model.addAttribute("bodyType",0); model.addAttribute("code",null); model.addAttribute("reasons",null); // 0不显示二维码 model.addAttribute("type",0); }else{ if (info.getOrderStatus().equals("AUDIT_PASS")){ // 通过才展示二维码 model.addAttribute("type",1); }else{ model.addAttribute("type",0); } model.addAttribute("code",info.getQrCode()); model.addAttribute("item",info); model.addAttribute("bodyType",info.getBodyType()); @@ -223,6 +231,29 @@ if(beneficiaryBack==null || beneficiaryBack.equals("")){ beneficiaryBack = data.getBeneficiaryBack(); operatorAuth.setBeneficiaryBack(data.getBeneficiaryBack()); } }else{ if(businessPicture==null || businessPicture.equals("")){ // 未上传营业执照 return 5001; } if(legalFront==null || legalFront.equals("")){ // 未上传法人身份证正面照 return 5002; } if(legalBack==null || legalBack.equals("")){ // 未上传法人身份证背面照 return 5003; } if (businessPicture!=null && businessPicture.equals("ENTERPRISE")){ if(beneficiaryFront==null || beneficiaryFront.equals("")){ // 未上传受益人身份证正面照 return 5004; } if(beneficiaryBack==null || beneficiaryBack.equals("")){ // 未上传受益人身份证背面照 return 5005; } } } String numericUUID = uuid.toString().replaceAll("-", ""); @@ -377,10 +408,17 @@ if (userId1!=null){ // 设置为审核中状态 userId1.setAlipayAudit(1); if (bodyType.equals("ENTERPRISE")){ userId1.setAlipayType(2); }else{ userId1.setAlipayType(1); } // userId1.setWechatAudit(1); operatorUserService.updateById(userId1); operatorAuth.setQrCode(null); operatorAuthService.saveOrUpdate(operatorAuth); // 根据选择类型修改认证类型 } } } else { cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
@@ -96,7 +96,6 @@ String uboIcFront,String uboIcBack, String uboIcAddress) { MgtShopAuthDto mgtShopAuthDto = new MgtShopAuthDto(); Integer userId = Objects.requireNonNull(UserExt.getUser()).getId(); mgtShopAuthDto.setUserId(userId); mgtShopAuthDto.setAuthId("1"); mgtShopAuthDto.setShopId(Long.valueOf(operatorId)); cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
@@ -122,7 +122,7 @@ </div> </div> <div class="form-group"> <#avatar id="license" name="营业执照" avatarImg="${item.businessPicture}" /> <#avatar id="license" name="*营业执照" avatarImg="${item.businessPicture}" /> </div> </div> </div> @@ -154,7 +154,7 @@ </div> </div> <div class="form-group"> <#avatar id="IDCardImg" name="法人身份证正面照" avatarImg="${item.legalFront}" /> <#avatar id="IDCardImg" name="*法人身份证正面照" avatarImg="${item.legalFront}" /> </div> </div> <div class="col-lg-6" style=""> @@ -177,7 +177,7 @@ </div> </div> <div class="form-group"> <#avatar id="IDCardImg1" name="法人身份证背面照" avatarImg="${item.legalBack}" /> <#avatar id="IDCardImg1" name="*法人身份证背面照" avatarImg="${item.legalBack}" /> </div> </div> </div> @@ -190,7 +190,6 @@ <input checked type="radio" name="type" value="false">否 </label> </div> <div class="form-group"> <label class="col-sm-3 control-label">*受益人姓名：</label> <div class="col-sm-9"> @@ -217,7 +216,7 @@ </div> </div> <div class="form-group"> <#avatar id="bImg1" avatarImg="${item.beneficiaryFront}" name="受益人身份证正面照" /> <#avatar id="bImg1" avatarImg="${item.beneficiaryFront}" name="*受益人身份证正面照" /> </div> </div> <div class="col-lg-6" style=""> @@ -228,7 +227,7 @@ </div> </div> <div class="form-group"> <#avatar id="bImg2" avatarImg="${item.beneficiaryFront}" name="受益人身份证背面照" /> <#avatar id="bImg2" avatarImg="${item.beneficiaryFront}" name="*受益人身份证背面照" /> </div> </div> </div> @@ -245,9 +244,11 @@ </div> @} @if(code != null){ @if(type==1){ <label class="col-sm-3 control-label">请使用手机支付宝扫描下方二维码完成进一步认证</label> <img src="${code}"> @} @} <div class="form-group"> <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5" > cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js
@@ -102,25 +102,25 @@ Feng.error("请选择主体类型"); return; } if ("" == $("#name").val() || null == $("#name").val()){ if ("" == $("#name").val() ){ Feng.error("请输入联系人姓名"); return; } if ("" == $("#phone").val() || null == $("#phone").val()){ if ("" == $("#phone").val() ){ Feng.error("请输入联系人电话"); return; } if ("" == $("#number").val() || null == $("#number").val()){ if ("" == $("#number").val() ){ Feng.error("请输入联系人身份证号"); return; } var platform = $("input[name='platform']:checked").val(); if ("" == $("#merchantName").val() || null == $("#merchantName").val()){ if ("" == $("#merchantName").val() ){ Feng.error("请输入营业执照商户名称"); return; } if ("" == $("#lrName").val() || null == $("#lrName").val()){ if ("" == $("#lrName").val() ){ Feng.error("请输入法定代表人姓名"); return; } @@ -135,18 +135,18 @@ Feng.error("请输入营业执照生效期间"); return; } if ("" == $("#licenseRegistration").val() || null == $("#licenseRegistration").val()){ if ("" == $("#licenseRegistration").val() ){ Feng.error("请输入营业执照注册号"); return; } if ("" == $("#registerAddress").val() || null == $("#registerAddress").val()){ if ("" == $("#registerAddress").val() ){ Feng.error("请输入注册地址"); return; } if ("" == $("#legalPerson").val() || null == $("#legalPerson").val()){ if ("" == $("#legalPerson").val()){ Feng.error("请输入法人姓名"); return; }if ("" == $("#legalPhone").val() || null == $("#legalPhone").val()){ }if ("" == $("#legalPhone").val()){ Feng.error("请输入法人手机号"); return; } @@ -157,43 +157,43 @@ return; } } if ("" == $("#IDCardTime").val() || null == $("#IDCardTime").val()){ if ("" == $("#IDCardTime").val()){ Feng.error("请输入法人身份证开始时间"); return; } if ("" == $("#lIDNumber").val() || null == $("#lIDNumber").val()){ if ("" == $("#lIDNumber").val()){ Feng.error("请输入法人身份证号"); return; }if ("" == $("#lEmail").val() || null == $("#lEmail").val()){ }if ("" == $("#lEmail").val()){ Feng.error("请输入法人邮箱"); return; }if ("" == $("#lIDAddress").val() || null == $("#lIDAddress").val()){ }if ("" == $("#lIDAddress").val()){ Feng.error("请输入法人身份证地址"); return; } if(bodyType=="ENTERPRISE"){ if ("" == $("#bName").val() || null == $("#bName").val()){ if ("" == $("#bName").val()){ Feng.error("请输入受益人姓名"); return; } if ("" == $("#bAddress").val() || null == $("#bAddress").val()){ if ("" == $("#bAddress").val()){ Feng.error("请输入受益人身份证地址"); return; } var bIDCardT = document.getElementById("bIDCardT"); if (!bIDCardT.checked){ if ("" == $("#bEnd").val() || null == $("#bEnd").val()){ if ("" == $("#bEnd").val()){ Feng.error("请输入受益人身份证结束时间"); return; } } if ("" == $("#bTime").val() || null == $("#bTime").val()){ if ("" == $("#bTime").val()){ Feng.error("请输入受益人身份证开始时间"); return; } if ("" == $("#bIDNumber").val() || null == $("#bIDNumber").val()){ if ("" == $("#bIDNumber").val()){ Feng.error("请输入受益人身份证号"); return; } @@ -202,9 +202,21 @@ //提交信息 var ajax = new $ax(Feng.ctxPath + "/operator/auth", function(data){ if (data==5001){ Feng.error("未上传营业执照!"); }else if(data==5002){ Feng.error("未上传法人身份证正面照!"); }else if(data==5003){ Feng.error("未上传法人身份证背面照!"); }else if(data==5004){ Feng.error("未上传受益人身份证正面照!"); }else if(data==5005){ Feng.error("未上传受益人身份证背面照!"); }else{ Feng.success("操作成功!"); window.parent.TSite.table.refresh(); TSite.close(); } },function(data){ Feng.error("操作失败!"); }); @@ -412,5 +424,4 @@ c5.init(); c6.setUploadBarId("progressBar"); c6.init(); });
