1

ydd_mer_java/crmeb-front/pom.xml

@@ -34,6 +34,16 @@
             <version>4.4.0</version>
             <scope>compile</scope>
         </dependency>
+        <!--dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson</artifactId>
+            <version>25.1</version>
+        </dependency-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.0</version>
+        </dependency>
     </dependencies>
 
     <build>

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java

@@ -6,6 +6,7 @@ import com.zbkj.common.exception.CrmebException;
 import com.zbkj.common.model.seckill.SeckillProduct;
 import com.zbkj.common.model.system.SystemConfig;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.common.query.IndexMerchantQuery;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.*;
 import com.zbkj.common.result.CommonResult;
@@ -58,8 +59,9 @@ public class IndexController {
 
     @ApiOperation(value = "首页店铺列表-根据数量加载")
     @RequestMapping(value = "/merchant/list/{recomdnum}", method = RequestMethod.GET)
-    public CommonResult<CommonPage<IndexMerchantResponse>> getMerchantListByRecomdNum(@PathVariable(name = "recomdnum", required = false) Integer recomdnum) {
-        return CommonResult.success(CommonPage.restPage(indexService.findIndexMerchantListByRecomdNum(recomdnum)));
+    public CommonResult<CommonPage<IndexMerchantResponse>> getMerchantListByRecomdNum(@PathVariable(name = "recomdnum", required = false) Integer recomdnum,
+                                                                                      IndexMerchantQuery indexMerchantQuery) {
+        return CommonResult.success(CommonPage.restPage(indexService.findIndexMerchantListByRecomdNum(indexMerchantQuery,recomdnum)));
     }
 
     @ApiOperation(value = "首页店铺列表-根据id集合加载")

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/IndexService.java

@@ -3,6 +3,7 @@ package com.zbkj.front.service;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.common.model.seckill.SeckillProduct;
 import com.zbkj.common.model.system.SystemConfig;
+import com.zbkj.common.query.IndexMerchantQuery;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.*;
 import com.zbkj.common.vo.SplashAdConfigVo;
@@ -60,7 +61,7 @@ public interface IndexService{
      * 首页商户列表
      * @param recomdProdsNum 推荐商品数量
      */
-    List<IndexMerchantResponse> findIndexMerchantListByRecomdNum(Integer recomdProdsNum);
+    List<IndexMerchantResponse> findIndexMerchantListByRecomdNum(IndexMerchantQuery indexMerchantQuery, Integer recomdProdsNum);
 
     /**
      * 根据商户id集合查询对应商户信息

ydd_mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/IndexServiceImpl.java

@@ -11,6 +11,7 @@ import com.zbkj.common.model.system.GroupConfig;
 import com.zbkj.common.model.system.SystemConfig;
 import com.zbkj.common.model.user.User;
 import com.zbkj.common.page.CommonPage;
+import com.zbkj.common.query.IndexMerchantQuery;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.common.response.*;
 import com.zbkj.common.utils.CrmebUtil;
@@ -83,6 +84,7 @@ public class IndexServiceImpl implements IndexService {
         IndexInfoResponse indexInfoResponse = new IndexInfoResponse();
         indexInfoResponse.setBanner(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_BANNER)); //首页banner滚动图
         indexInfoResponse.setMenus(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_INDEX_MENU)); //首页金刚区
+        indexInfoResponse.setProList(merchantService.findProIndexList(2));//首页活动精选区
         indexInfoResponse.setLogoUrl(systemAttachmentService.getCdnUrl());// 移动端顶部logo 1.3版本 DIY 已经替代
         indexInfoResponse.setWechatBrowserVisit(systemConfigService.getValueByKey(SysConfigConstants.CONFIG_WECHAT_BROWSER_VISIT));// 是否开启微信公众号授权登录
         // 客服部分
@@ -168,8 +170,8 @@ public class IndexServiceImpl implements IndexService {
      * 首页商户列表
      */
     @Override
-    public List<IndexMerchantResponse> findIndexMerchantListByRecomdNum(Integer recomdProdsNum) {
-        return merchantService.findIndexList(recomdProdsNum);
+    public List<IndexMerchantResponse> findIndexMerchantListByRecomdNum(IndexMerchantQuery indexMerchantQuery, Integer recomdProdsNum) {
+        return merchantService.findIndexList(indexMerchantQuery,recomdProdsNum);
     }
 
     /**

ydd_mer_java/crmeb-front/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ crmeb:
   wechat-api-url:  #请求微信接口中专服务器
   asyncConfig: false #是否同步config表数据到redis
   asyncWeChatProgramTempList: false #是否同步小程序公共模板库
-  imagePath: /JAVA_PROJECT/MER/trip/admin/ # 服务器图片路径配置 斜杠结尾
+  imagePath: /home/ydd/MER/trip/admin/ # 服务器图片路径配置 斜杠结尾
   retailStoreBrokerageRatio: 30 #佣金返佣比例和上限
   activityStyleCachedTime: 10 #活动边框缓存周期 秒为单位，生产环境适当5-10分钟即可
   selectProductLimit: 100 # 商品选择 指定商品上线
@@ -26,9 +26,9 @@ spring:
     username: yidiandao
     password: yidiandao@2025!
   redis:
-    host: 127.0.0.1 #地址
-    port: 6379 #端口
-    #password: 111111
+    host: 39.105.58.247 #地址
+    port: 6380 #端口
+    password: hnyy20220314
     timeout: 10000 # 连接超时时间（毫秒）
     database: 8 #默认数据库
     jedis: