From 111a9da81d0f7cab8f9c1de643505b9595e628cd Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 02 八月 2021 13:40:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index 8f1ee1b..709f928 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -6,6 +6,8 @@
import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.dtos.shop.ExcelShopOrderDTO;
+import com.panzhihua.common.constants.SecurityConstants;
+import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
@@ -108,9 +110,6 @@
loginUserInfoVO.setUserId(userId);
R r = userService.putUserAuthentication(loginUserInfoVO);
if (R.isOk(r)) {
- //清空缓存
- String userKey = UserConstants.LOGIN_USER_INFO + this.getUserId();
- stringRedisTemplate.delete(userKey);
//通过发通知
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
@@ -124,7 +123,11 @@
if (R.isOk(r1)) {
log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
}
-
+ //清空缓存
+ String userRoleKey = UserConstants.LOGIN_USER_INFO + this.getLoginUserInfo().getUserId();
+ String userAppletRoleKey = SecurityConstants.ROLE_APPLETS_USER + this.getLoginUserInfo().getUserId();
+ stringRedisTemplate.delete(userRoleKey);
+ stringRedisTemplate.delete(userAppletRoleKey);
} else {
//未通过发通知
/**
@@ -290,10 +293,6 @@
Long id = comActMicroWishVO.getId();
if (null == id || 0 == id) {
return R.fail("心愿主键不能为空");
- }
- String evaluate = comActMicroWishVO.getEvaluate();
- if (ObjectUtils.isEmpty(evaluate)) {
- return R.fail("用户评价不能为空");
}
Integer score = comActMicroWishVO.getScore();
if (null == score || 0 == score) {
--
Gitblit v1.7.1