|
@@ -15,7 +15,9 @@ import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/***
|
|
|
* <Title> AppUserInfoController </Title>
|
|
@@ -41,18 +43,21 @@ public class AppUserInfoController {
|
|
|
Gson gson =new Gson();
|
|
|
ResultData resultData=null;
|
|
|
AppUserInfo appUserInfo =new AppUserInfo();
|
|
|
+ String openId = "";
|
|
|
try{
|
|
|
if(request.getUserType()!=null){
|
|
|
//1-微信公众号
|
|
|
if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getBlogOpenid())&&StringUtils.isNotBlank(request.getBlogToken())){
|
|
|
appUserInfo.setUserType(request.getUserType());
|
|
|
appUserInfo.setBlogToken(request.getBlogToken());
|
|
|
- appUserInfo.setBlogOpenid(request.getBlogOpenid());
|
|
|
+ openId = request.getBlogOpenid();
|
|
|
+ appUserInfo.setBlogOpenid(openId);
|
|
|
//2-微信小程序
|
|
|
}else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())&&StringUtils.isNotBlank(request.getMinaToken())){
|
|
|
appUserInfo.setUserType(request.getUserType());
|
|
|
appUserInfo.setMinaToken(request.getMinaToken());
|
|
|
- appUserInfo.setMinaOpenid(request.getMinaOpenid());
|
|
|
+ openId = request.getMinaOpenid();
|
|
|
+ appUserInfo.setMinaOpenid(openId);
|
|
|
}
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(request.getBlogNickName())){
|
|
@@ -64,26 +69,27 @@ public class AppUserInfoController {
|
|
|
if(StringUtils.isNotBlank(request.getBlogProfilePhoto())){
|
|
|
appUserInfo.setBlogProfilePhoto(request.getBlogProfilePhoto());
|
|
|
}
|
|
|
- if(StringUtils.isNotBlank(request.getRegisteDate())){
|
|
|
- appUserInfo.setRegisteDate(new Date());
|
|
|
- }
|
|
|
- if(StringUtils.isNotBlank(request.getUpdateDate())){
|
|
|
- appUserInfo.setUpdateDate(new Date());
|
|
|
- }
|
|
|
+
|
|
|
+ appUserInfo.setRegisteDate(new Date());
|
|
|
+ appUserInfo.setUpdateDate(new Date());
|
|
|
+
|
|
|
if(StringUtils.isNotBlank(request.getSexFlag())){
|
|
|
appUserInfo.setSexFlag(request.getSexFlag());
|
|
|
}
|
|
|
|
|
|
+ Map<String, Object> params = new HashMap<>();
|
|
|
+ params.put("openId", openId);
|
|
|
+ params.put("userType", request.getUserType());
|
|
|
//判断该用户是否已存在
|
|
|
- List<AppUserInfo> appUserInfoList = appUserInfoService.Authentication(appUserInfo);
|
|
|
- if(appUserInfoList !=null && appUserInfoList.size() > 0){
|
|
|
+ int count = appUserInfoService.isExistAppUser(params);
|
|
|
+ if(count > 0){
|
|
|
resultData = ResultData.error(CodeMsg.USER_EXSIST);
|
|
|
}else {
|
|
|
appUserInfoService.AddAppUserInfo(appUserInfo);
|
|
|
- resultData=ResultData.success(CodeMsg.SUCCESS);
|
|
|
+ resultData = ResultData.success(CodeMsg.SUCCESS);
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
- resultData=ResultData.error(CodeMsg.INSERT_FAIL);
|
|
|
+ resultData = ResultData.error(CodeMsg.INSERT_FAIL);
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
return gson.toJson(resultData);
|