From aa2c3d4deba76ade0958ff3ced88396e226a4964 Mon Sep 17 00:00:00 2001
From: duhuizhe <271000472@qq.com>
Date: 星期三, 15 五月 2024 19:57:40 +0800
Subject: [PATCH] 项目启动失败问题解决
---
ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java
index db538c3..aa2b1fb 100644
--- a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java
+++ b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityShopRecordController.java
@@ -8,7 +8,7 @@
import com.nuvole.base.domain.SysUser;
import com.nuvole.common.domain.result.CommonResult;
import com.nuvole.common.domain.result.PageBean;
-import com.nuvole.four.client.ShopServiceClient;
+//import com.nuvole.four.client.ShopServiceClient;
import com.nuvole.four.contants.Contants;
import com.nuvole.four.controller.BaseController;
import com.nuvole.four.domain.ActivityShopRecord;
@@ -47,7 +47,7 @@
private final ActivityShopRecordService activityShopRecordService;
private final ChannelInfoService channelInfoService;
- private final ShopServiceClient shopServiceClient;
+// private final ShopServiceClient shopServiceClient;
@ApiOperation(value = "鏌ヨ鍒楄〃", notes = "鏌ヨ鍒楄〃")
@ApiImplicitParams({@ApiImplicitParam(name = "ActivityShopRecordQuery")})
@@ -171,7 +171,8 @@
if(StrUtil.isBlank(queryOrgCode)){
queryOrgCode = user.getOrgCode();
}
- CommonResult<PageBean<Map>> mapResult = shopServiceClient.getMerchantShopExtendList(queryOrgCode,merchantId,shopName,managerName,channelId,"channelIdNotNull",pageNumber,pageSize);
+// CommonResult<PageBean<Map>> mapResult = shopServiceClient.getMerchantShopExtendList(queryOrgCode,merchantId,shopName,managerName,channelId,"channelIdNotNull",pageNumber,pageSize);
+ CommonResult<PageBean<Map>> mapResult = new CommonResult<>();
List<Map> mapList = mapResult.getData().getRows();
if(!CollectionUtils.isEmpty(mapList)){
String[] idsArr = mapList.stream()
--
Gitblit v1.9.1