From 861eb5853d91ffd48f1919cb739f28f7e2bb0b59 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 17:51:44 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 6c9aa04..98b8987 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -80,13 +80,22 @@
@Resource
private ConvenientViewStatisticsDAO convenientViewStatisticsDAO;
+ private static final String DQ="510402";
+ private static final String RHQ="510411";
+
@Override
@Transactional(rollbackFor = Exception.class)
public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
if(convenientMerchantDTO.getCommunityId()==0){
- convenientMerchantDO.setCommunityName("西区社区");
+ if(DQ.equals(convenientMerchantDTO.getAreaCode())){
+ convenientMerchantDO.setCommunityName("东区社区");
+ }else if(RHQ.equals(convenientMerchantDTO.getAreaCode())){
+ convenientMerchantDO.setCommunityName("仁和区社区");
+ }else{
+ convenientMerchantDO.setCommunityName("西区社区");
+ }
}
else {
ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
@@ -288,7 +297,7 @@
Page page = new Page<>();
page.setSize(pagePopularMerchantDTO.getPageSize());
page.setCurrent(pagePopularMerchantDTO.getPageNum());
- IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon);
+ IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon,pagePopularMerchantDTO.getAreaCode());
if(pagePopularMerchantDTO.getPageNum().equals(1L)){
//第一页默认把犇师傅维修中心加载到第一个
List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
--
Gitblit v1.7.1