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/ActivityFeeController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityFeeController.java b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityFeeController.java
index 92b6890..7e4b821 100644
--- a/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityFeeController.java
+++ b/ecosphere/ecosphere-four-payment/src/main/java/com/nuvole/four/controller/pc/ActivityFeeController.java
@@ -6,7 +6,6 @@
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.contants.Contants;
import com.nuvole.four.controller.BaseController;
import com.nuvole.four.domain.ActivityDistributeRecord;
@@ -30,7 +29,6 @@
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* @Description 璐圭巼琛ヨ创娲诲姩绠＄悊
@@ -47,7 +45,7 @@
private final ActivityFeeService activityFeeService;
private final SysOrgServiceImpl sysOrgService;
private final ActivityDistributeRecordServiceImpl activityDistributeRecordService;
- private final ShopServiceClient shopServiceClient;
+// private final ShopServiceClient shopServiceClient;
/**
@@ -176,8 +174,8 @@
SysUser user = SystemUtil.getLoginUser(Contants.LOGIN_TYPE_PC);
orgCode = user.getOrgCode();
}
- CommonResult<PageBean<Map>> mapResult = shopServiceClient.merchantActivityList(orgCode, channelId, activityId, startDate,endDate, pageNumber, pageSize);
- return mapResult;
+// CommonResult<PageBean<Map>> mapResult = shopServiceClient.merchantActivityList(orgCode, channelId, activityId, startDate,endDate, pageNumber, pageSize);
+ return new CommonResult<>();
}
/**
@@ -198,8 +196,8 @@
SysUser user = SystemUtil.getLoginUser(Contants.LOGIN_TYPE_PC);
orgCode = user.getOrgCode();
}
- CommonResult<Map> mapResult = shopServiceClient.merchantActivityCollect(orgCode, channelId, activityId, startDate,endDate);
- return mapResult;
+// CommonResult<Map> mapResult = shopServiceClient.merchantActivityCollect(orgCode, channelId, activityId, startDate,endDate);
+ return new CommonResult<>();
}
/**
--
Gitblit v1.9.1