From 813c7d34d10a890c4c5dcfb48541f517edc4b156 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 16 八月 2022 17:18:59 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 12 ++++++++++--
1 files changed, 10 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 a15497c..956f084 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
@@ -300,11 +300,19 @@
page.setCurrent(pagePopularMerchantDTO.getPageNum());
IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon,pagePopularMerchantDTO.getAreaCode());
if(pagePopularMerchantDTO.getPageNum().equals(1L)){
+ //金沙江默认第一个
+ List<ConvenientMerchantVO> merchantVOS=new ArrayList<>();
+ ConvenientMerchantVO merchantVO=new ConvenientMerchantVO();
+ merchantVO.setName("金沙江智慧物流商贸城");
+ merchantVO.setLogo("https://www.psciio.com//idcard/0694d975ed4d4c49bcfb728a678518f2.jpg");
+ merchantVO.setIntroduction("农产直销、综合商贸、冷链储运、中央厨房、检验检疫、农博会展、总部商务、综合服务。");
+ merchantVOS.add(merchantVO);
//第一页默认把犇师傅维修中心加载到第一个
List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
if(merchantList != null && merchantList.size() > 0){
- merchantList.addAll(merchantVOList.getRecords());
- merchantVOList.setRecords(merchantList);
+ merchantVOS.addAll(merchantList);
+ merchantVOS.addAll(merchantVOList.getRecords());
+ merchantVOList.setRecords(merchantVOS);
}
}
--
Gitblit v1.7.1