From a577ee5fdd8cddbc89f2b3d5632a7a53dd4e2d34 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 18 二月 2022 14:19:35 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 12 +++++++-----
3 files changed, 9 insertions(+), 6 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..e57355b 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
@@ -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();
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
index 7927a8a..820c115 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -489,6 +489,7 @@
return R.fail(401, "请先登录");
}
pagePopularMerchantDTO.setCommunityId(communityId);
+ pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
return communityService.getScreenPopularMerchants(pagePopularMerchantDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
index 5195201..da68bf4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
@@ -122,7 +122,7 @@
FROM com_convenient_merchants ccm
LEFT JOIN (SELECT * FROM com_convenient_consultation_statistics WHERE statistic_date LIKE #{currentMon}) cccs ON ccm.id = cccs.merchant_id
LEFT JOIN com_convenient_service_scope ccss ON ccm.id = ccss.merchant_id
- WHERE ccm.area_code=#{areaCode} and ( ccm.community_id = ${communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心'
+ WHERE ccm.area_code=#{areaCode} and ( ccm.community_id = ${communityId} or ccm.community_id = 0) AND ccm.business_status = 1 and ccm.is_del = 0 and ccm.`name` != '犇师傅维修中心' GROUP BY cccs.id
) temp GROUP BY temp.id ORDER BY SUM(temp.consultation_volume) DESC
</select>
<select id="getClassifyMerchants" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO">
--
Gitblit v1.7.1