Commit 8267f210 by guojuxing

商户创建时间

parent 834cd831
...@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -75,6 +76,7 @@ public class LoginController { ...@@ -75,6 +76,7 @@ public class LoginController {
List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult(); List<EnterpriseDTO> enterpriseDTOList = this.enterpriseApiService.listEnterpriseByIds(enterpriseIdList).getResult();
//随机取一个用户 //随机取一个用户
Integer enterpriseId = userDTOList.get(0).getEnterpriseId(); Integer enterpriseId = userDTOList.get(0).getEnterpriseId();
Date enterpriseCreateTime = userDTOList.get(0).getCreateTime();
ServiceResponse<Void> smsSendResult = ServiceResponse.success(); ServiceResponse<Void> smsSendResult = ServiceResponse.success();
if(!tsPhone.equals(phoneNumber)){ if(!tsPhone.equals(phoneNumber)){
code = CreateRandomUtils.generateNumberStr(4); code = CreateRandomUtils.generateNumberStr(4);
...@@ -84,6 +86,7 @@ public class LoginController { ...@@ -84,6 +86,7 @@ public class LoginController {
String key = "GYTCode:" + areaCode + ":" + phoneNumber; String key = "GYTCode:" + areaCode + ":" + phoneNumber;
LoginUserVo userVo = new LoginUserVo(); LoginUserVo userVo = new LoginUserVo();
userVo.setEnterpriseId(enterpriseId); userVo.setEnterpriseId(enterpriseId);
userVo.setCreateTime(enterpriseCreateTime);
userVo.setAreaCode(areaCode); userVo.setAreaCode(areaCode);
userVo.setCode(code); userVo.setCode(code);
userVo.setPhoneNumber(phoneNumber); userVo.setPhoneNumber(phoneNumber);
......
package com.gic.cloud.web.vo; package com.gic.cloud.web.vo;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 登录用户 * 登录用户
* @ClassName: LoginUserVo
 * @ClassName: LoginUserVo

...@@ -19,6 +21,11 @@ public class LoginUserVo implements Serializable { ...@@ -19,6 +21,11 @@ public class LoginUserVo implements Serializable {
private String areaCode; private String areaCode;
private String code; private String code;
/**
* 商户创建时间
*/
private Date createTime;
public Integer getUserId() { public Integer getUserId() {
return userId; return userId;
} }
...@@ -82,4 +89,13 @@ public class LoginUserVo implements Serializable { ...@@ -82,4 +89,13 @@ public class LoginUserVo implements Serializable {
public void setIsSingle(Integer isSingle) { public void setIsSingle(Integer isSingle) {
this.isSingle = isSingle; this.isSingle = isSingle;
} }
public Date getCreateTime() {
return createTime;
}
public LoginUserVo setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment