productDev/zbomyoujia.git

			@@ -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;
			}