diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java index f4238fc25b..9abbfc36b6 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -42,6 +42,11 @@ public interface AppSysUserFeign { public ResultBean sendVerificationCodeForApp(@RequestParam("mobile") String mobile, @RequestParam("type") String type, @RequestParam("appId") String appId); + @ApiOperation(value = "小程序发送验证码(登录、修改密码、找回密码)") + @ResponseBody + @PostMapping("/sendVerificationCodeForWx") + public ResultBean sendVerificationCodeForWx(@RequestParam("mobile") String mobile, @RequestParam("type") String type); + @ApiOperation(value = "我的信息") @ResponseBody @GetMapping("/getMyInfo/{userSid}") diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java index 6d1a294b75..e697999081 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -31,6 +31,11 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); } + @Override + public ResultBean sendVerificationCodeForWx(String mobile, String type) { + return null; + } + @Override public ResultBean getMyInfo(String userSid) { return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index df0b19bf88..298aa04e6b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -1580,4 +1580,53 @@ public class SysUserService extends MybatisBaseService { SysUser sysUser = fetchBySid(sid); return rb.success().setData(sysUser); } + + /** + * 发送小程序端登录验证码 + * + * @param mobile + * @param type 1、登录2、修改密码3、找回密码 + * @return + */ + public ResultBean sendVerificationCodeForAppWx(String mobile, String type) { + Date date = new Date(); + String redisKey = ""; + if (type.equals("1")) { + redisKey = "loginCode"; + } else if (type.equals("2")) { + redisKey = "updatePwdCode"; + } else if (type.equals("3")) { + redisKey = "resetPwdCode"; + } + String codeRedis = redisUtil.get(redisKey + mobile); + if (StringUtils.isNotEmpty(codeRedis)) { + //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信 + String sendTime = codeRedis.substring(4); + long diffSecond = (date.getTime() - Long.parseLong(sendTime)) / 1000; + if (diffSecond < 60) { + return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!"); + } + } + String verificationCode = ""; + for (int i = 0; i < LENGTH_OF_CODE; i++) { + // 定义随机类 + Random random = new Random(); + // 返回[0,10)集合中的整数，注意不包括10 + int result = random.nextInt(10); + // +1后，[0,10)集合变为[1,11)集合，满足要求 + verificationCode = verificationCode + result; + } + String content = ""; + if (type.equals("1")) { + content = "登录验证码：" + verificationCode + "，用于登录小程序,有效期5分钟，如非本人操作，请忽略。"; + } else { + content = "修改密码验证码：" + verificationCode + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略。"; + } + String res = MsgWs.SendWaitWorkMsg(mobile, content); +// String res = "1"; + if (res.equals("1")) { + redisUtil.set(redisKey + mobile, verificationCode + date.getTime(), APP_LOGIN_CODE_TIME_LIMIT); + } + return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index c8fef57ad0..83eae4cd41 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -368,6 +368,28 @@ public class AppSysUserRest implements AppSysUserFeign { return sysUserService.sendVerificationCodeForApp(mobile, type); } + /** + * 小程序发送短信验证码 + * + * @param mobile + * @param type 1、登录2、修改密码3、找回密码 + * @return + */ + @Override + public ResultBean sendVerificationCodeForWx(String mobile, String type) { + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return new ResultBean().fail().setMsg("请输入正确的手机号"); + } + SysUser sysUser = sysUserService.selectByUserNameWx(mobile); + if (null == sysUser) { + sysUser = sysUserService.selectByMobileWx(mobile); + if (sysUser == null) { + return new ResultBean().fail().setMsg("该手机号暂时还未注册，请先注册"); + } + } + return sysUserService.sendVerificationCodeForAppWx(mobile, type); + } + /** * 插入错误的信息 * diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java index 1ff8ae38ea..77478dad3c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentHistoryListDetailsWxVo.java @@ -19,5 +19,5 @@ public class AppRepaymentHistoryListDetailsWxVo implements Vo { @ApiModelProperty("标题") private List thead; @ApiModelProperty("表格") - private List record; + private List records; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java index 1bbcba4941..f8065305e3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanListDetailsWxVo.java @@ -35,5 +35,5 @@ public class AppRepaymentPlanListDetailsWxVo implements Vo { @ApiModelProperty("标题") private List thead; @ApiModelProperty("表格") - private List record; + private List records; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 53bce3fe9b..799a2b3313 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -6982,23 +6982,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selByMainSidAndPolicyOrOther(scheduleSid, "1"); appRepaymentPlanListDetailsWxVo.setOtherManagement(loanRepaymentPlanDetails.get(0).getBankName()); } - AppRepaymentPlanThead appRepaymentPlanThead4 = new AppRepaymentPlanThead(); - appRepaymentPlanThead4.setName("otherMonthlyPaymentStr"); - String[] qtrDate = loanRepaymentSchedule.getOtherRepayDate().toString().split("-"); - appRepaymentPlanThead4.setLabel("其他融(" + qtrDate[qtrDate.length - 1] + "日)"); - appRepaymentPlanThead4.setWidth("100"); - appRepaymentPlanThead4.setEmptyString("-"); - appRepaymentPlanThead4.setAlign("center"); - appRepaymentPlanTheads.add(appRepaymentPlanThead4); } appRepaymentPlanListDetailsWxVo.setVinNo(vinNo); AppRepaymentPlanThead appRepaymentPlanThead1 = new AppRepaymentPlanThead(); @@ -7018,15 +7010,25 @@ public class LoanRepaymentScheduleService extends MybatisBaseService appRepaymentPlanRecords = loanRepaymentPlanDetailsService.selByMainSidAndVinNo(scheduleSid, vinNo); - appRepaymentPlanListDetailsWxVo.setRecord(appRepaymentPlanRecords); + appRepaymentPlanListDetailsWxVo.setRecords(appRepaymentPlanRecords); return appRepaymentPlanListDetailsWxVo; } @@ -7038,7 +7040,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService appRepaymentHistoryRecords = loanRepaymentHistoryService.selSchSidAndVinNo(scheduleSid,vinNo); - appRepaymentHistoryListDetailsWxVo.setRecord(appRepaymentHistoryRecords); + appRepaymentHistoryListDetailsWxVo.setRecords(appRepaymentHistoryRecords); return appRepaymentHistoryListDetailsWxVo; } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java index 82d17b0d61..65b20f8a69 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentHistoryListDetailsWxVo.java @@ -19,5 +19,5 @@ public class RepaymentHistoryListDetailsWxVo implements Vo { @ApiModelProperty("标题") private List thead; @ApiModelProperty("表格") - private List record; + private List records; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java index b1f51de958..29af9b0e02 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanListDetailsWxVo.java @@ -35,5 +35,5 @@ public class RepaymentPlanListDetailsWxVo implements Vo { @ApiModelProperty("标题") private List thead; @ApiModelProperty("表格") - private List record; + private List records; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index 079a98a457..27527673ed 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -212,7 +212,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService