diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java index 6b65e8a..8f63de6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/WeChatUserController.java @@ -37,7 +37,7 @@ public class WeChatUserController extends BaseController { if(StrUtil.isEmpty(userVO.getPhone())){ return warn("手机号不能为空"); } - return success(weChatUserService.sendCode(userVO)); + return weChatUserService.sendCode(userVO); } /** * 小程序注册 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java index 7f09217..9c72b6f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java @@ -85,6 +85,29 @@ public class CaseAffiliate extends BaseEntity { /** 联系地址 */ @Excel(name = "联系地址") private String contactAddress; + /** 住所 */ + @Excel(name = "住所") + private String residenAffili; + /** 申请人代理人职称 */ + @Excel(name = "申请人代理人职称") + private String appliAgentTitle; + + public String getResidenAffili() { + return residenAffili; + } + + public void setResidenAffili(String residenAffili) { + this.residenAffili = residenAffili; + } + + public String getAppliAgentTitle() { + return appliAgentTitle; + } + + public void setAppliAgentTitle(String appliAgentTitle) { + this.appliAgentTitle = appliAgentTitle; + } + /** 单位地址 */ @Excel(name = "单位地址") private String workAddress; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index c22a1d6..962ade2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -80,7 +80,7 @@ public class CaseApplication extends BaseEntity { @Excel(name = "申请人主张违约金") private BigDecimal claimLiquidDamag; /** 申请人仲裁请求及事实和理由 */ - @Excel(name = "申请人仲裁请求及事实和理由") + @Excel(name = "申请人仲裁请求及事实和理由",width = 36) private String arbitratClaims; /** 仲裁应缴费用 */ private BigDecimal feePayable; @@ -121,7 +121,7 @@ public class CaseApplication extends BaseEntity { private Integer openCourtHear; /** 申请人请求仲裁庭裁决 */ - @Excel(name = "申请人请求仲裁庭裁决") + @Excel(name = "申请人请求仲裁庭裁决",width = 36) private String requestRule; /** 是否仲裁反请求 */ private Integer adjudicaCounter; @@ -562,6 +562,9 @@ public class CaseApplication extends BaseEntity { /** 联系地址 */ @Excel(name = "申请人主体信息-联系地址",width = 26) private String contactAddress; + /** 申请人住所 */ + @Excel(name = "申请人主体信息-住所",width = 26) + private String residenAffiliAppli; /** 单位电话 */ @Excel(name = "申请人主体信息-单位电话",width = 26) private String workTelphone; @@ -575,13 +578,41 @@ public class CaseApplication extends BaseEntity { /** 身份证号 */ @Excel(name = "申请人主体信息-代理人身份证号",width = 26) private String identityNumAgent; + /** 联系电话 */ @Excel(name = "申请人主体信息-代理人联系电话",width = 26) private String contactTelphoneAgent; /** 联系地址 */ @Excel(name = "申请人主体信息-代理人联系地址",width = 26) private String contactAddressAgent; - /** + /** 申请人代理人职称 */ + @Excel(name = "申请人主体信息-代理人职称",width = 26) + private String appliAgentTitle; + + public String getResidenAffiliAppli() { + return residenAffiliAppli; + } + + public void setResidenAffiliAppli(String residenAffiliAppli) { + this.residenAffiliAppli = residenAffiliAppli; + } + + public String getAppliAgentTitle() { + return appliAgentTitle; + } + + public void setAppliAgentTitle(String appliAgentTitle) { + this.appliAgentTitle = appliAgentTitle; + } + + public String getResidenAffiliRespon() { + return residenAffiliRespon; + } + + public void setResidenAffiliRespon(String residenAffiliRespon) { + this.residenAffiliRespon = residenAffiliRespon; + } +/** * 被申请人主体信息 */ /** 姓名 */ @@ -635,6 +666,9 @@ public class CaseApplication extends BaseEntity { /** 联系地址 */ @Excel(name = "被申请人主体信息-联系地址",width = 26) private String debtorContactAddress; + /** 被申请人住所 */ + @Excel(name = "被申请人主体信息-住所",width = 26) + private String residenAffiliRespon; /** 单位电话 */ @Excel(name = "被申请人主体信息-单位电话",width = 26) private String debtorWorkTelphone; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java index ba03230..9d9735f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/WeChatUserService.java @@ -11,7 +11,7 @@ import com.ruoyi.wisdomarbitrate.domain.vo.WeChatUserVO; public interface WeChatUserService { - String sendCode(WeChatUserVO userVO); + AjaxResult sendCode(WeChatUserVO userVO); AjaxResult registerUser(IdentityAuthentication ientityAuthentication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 4f30751..50a3e9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -420,7 +420,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } if (insertUserRow > 0) { caseAffiliate.setApplicantAgentUserId(String.valueOf(agentUser.getUserId())); - // 发送短信 todo + // 发送短信 1955400 普通短信 导入后通知申请人认证注册 尊敬的{1},您的申请的仲裁案件已导入,复制访问https://miniapp-3gpama6l759911ef-1321289474.tcloudbaseapp.com/jump-mp.html 进入小程序进行认证注册。如非本人操作,请忽略本短信 已生效 + SmsUtils.SendSmsRequest request = new SmsUtils.SendSmsRequest(); + request.setTemplateId("1955400"); + request.setPhone(agentUser.getPhonenumber()); + request.setTemplateParamSet(new String[]{agentUser.getNickName()}); + SmsUtils.sendSms(request); } } else if (null != agentUser.getDeptId() && !String.valueOf(agentUser.getDeptId()).equals(caseAffiliate.getApplicationOrganId())) { return "申请机构与申请代理人不匹配"; @@ -1541,6 +1546,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseAffiliate.setCompLegalperPost(caseApplication.getCompLegalperPost()); caseAffiliate.setCompLegalPerson(caseApplication.getCompLegalPerson()); + caseAffiliate.setResidenAffili(caseApplication.getResidenAffiliAppli()); + caseAffiliate.setAppliAgentTitle(caseApplication.getAppliAgentTitle()); return caseAffiliate; @@ -1603,6 +1610,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { debtorCaseAffiliate.setContactAddressAgent(caseApplication.getDebtorContactAddressAgent()); debtorCaseAffiliate.setResponSex(caseApplication.getResponSex()); debtorCaseAffiliate.setResponBirth(caseApplication.getResponBirth()); + debtorCaseAffiliate.setResidenAffili(caseApplication.getResidenAffiliRespon()); return debtorCaseAffiliate; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java index 727c525..4ff87f1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/WeChatUserServiceImpl.java @@ -53,7 +53,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { private IdentityAuthenticationMapper identityAuthenticationMapper; @Override - public String sendCode(WeChatUserVO userVO) { + public AjaxResult sendCode(WeChatUserVO userVO) { Random random = new Random(); String code = ""; @@ -69,9 +69,10 @@ public class WeChatUserServiceImpl implements WeChatUserService { Boolean flag = SmsUtils.sendSms(request); if(flag){ setCodeCache(userVO.getPhone(),code); - return "短信发送成功"; + return AjaxResult.success("短信发送成功"); + }else { + return AjaxResult.warn("短信发送失败"); } - return "短信发送失败"; } /** * 设置验证码缓存 diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml index cfc1053..b632981 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseAffiliateMapper.xml @@ -27,12 +27,16 @@ + + +