From 4fc49f3f06e9bb6275045d32245469816b451a4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 23 七月 2024 09:57:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 31182ba..8cee3a7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
@@ -26,6 +27,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -54,11 +56,11 @@
private RedisTemplate<String, Object> redisTemplate;
@Override
- public ZSZXCatalogResponse getZSZXCatalogs(Long userId){
+ public ZSZXCatalogResponse getZSZXCatalogs(Long userId,String userType){
ZSZXCatalogResponse response = new ZSZXCatalogResponse();
ZTCatalogListRequest param = new ZTCatalogListRequest();
param.setUserId(userId.toString());
- param.setUserType(ZTConstants.CUSTOMER);
+ param.setUserType(userType);
param.setCatalogCode(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU);
List<ZTCatalogInfoResponse> cataList = getCatalogList(param);
if(cataList!=null ){
@@ -208,7 +210,9 @@
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ System.out.println("寮�濮嬫椂闂�========================銆�"+DateUtil.getLongDate(new Date()));
ZTBasePageResponse<ZTProductInfoResponse> response = zbomZhongTaiService.pageProductList(ztContentListRequest);
+ System.out.println("缁撴潫鏃堕棿========================銆�"+DateUtil.getLongDate(new Date()));
return response;
}
--
Gitblit v1.9.3