From 0b04d8143448f0beb94a5a139ad5f0f485315edb Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 19:34:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81]?= =?UTF-8?q?[=E6=96=B0=E5=A2=9E]:c=E7=AB=AF=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMsgValidationcodeController.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 43907885d..766ae4d0f 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -1,6 +1,7 @@ package com.simple.controller; import com.simple.common.ResultData; +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxMsgValidationcode; import com.simple.service.WxMerchantBUserService; import com.simple.service.WxMerchantService; @@ -33,34 +34,31 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("sendvalidationcode") @ApiImplicitParams({ - @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), - @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData sendvalidationcode(String tenantId, String phone, Integer type, String appid) { - + @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true)}) + public ResultData sendvalidationcode(String phone, Integer type) { + WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.setTenantId(user.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); - wxMsgValidationcode.setAppid(appid); + wxMsgValidationcode.setAppid(user.getAppId()); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); } @GetMapping("hasvalidationcode") @ApiImplicitParams({ - @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), - @ApiImplicitParam(name = "code", value = "验证码", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { + @ApiImplicitParam(name = "code", value = "验证码", dataType = "String", paramType = "query", required = true)}) + public ResultData hasvalidationcode(String phone, Integer type, String code) { + WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.setTenantId(user.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); - wxMsgValidationcode.setAppid(appid); + wxMsgValidationcode.setAppid(user.getAppId()); return wxMsgValidationcodeService.hasvalidationcode(wxMsgValidationcode); }