From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
index 6af6021..963b4e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -19,6 +19,9 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 基础controller
@@ -62,9 +65,9 @@
public Long getCommunityId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null == communityId || 0 == communityId) {
- throw new ServiceException("用户未绑定社区");
- }
+// if (null == communityId) {
+// throw new ServiceException("用户未绑定社区");
+// }
return communityId;
}
@@ -113,14 +116,13 @@
else {
return "510423";
}
- }
- else {
+ } else {
LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
ComActVO comActVO=loginUserInfoVO.getComActVO();
- if(comActVO!=null){
- return comActVO.getAreaCode();
+ if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){
+ return "510423";
}
- return "510423";
+ return comActVO.getAreaCode();
}
}
@@ -137,8 +139,11 @@
}
public String getAppId(){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return loginUserInfo.getAppId();
+ String appid = this.getRequest().getHeader("appid");
+ if(StringUtils.isEmpty(appid)){
+ return "wx0cef797390444b75";
+ }
+ return appid;
}
public String getAppSecret(){
--
Gitblit v1.7.1