Commit 6554d8da by 田超

Merge branch 'feature/bookrevert' into 'master'

feat:[1006809]revert

See merge request rays/pcloud-book!1535
parents b6bd8730 3dfca737
...@@ -320,7 +320,7 @@ public class AppConsr { ...@@ -320,7 +320,7 @@ public class AppConsr {
} }
@ParamLog("RAYS应用") /*@ParamLog("RAYS应用")
public Map<String, AppRaysDTO> mapRaysAppByType(List<String> typeCodes) { public Map<String, AppRaysDTO> mapRaysAppByType(List<String> typeCodes) {
Map<String, AppRaysDTO> map = new HashMap<>(); Map<String, AppRaysDTO> map = new HashMap<>();
if (ListUtils.isEmpty(typeCodes)) { if (ListUtils.isEmpty(typeCodes)) {
...@@ -333,5 +333,5 @@ public class AppConsr { ...@@ -333,5 +333,5 @@ public class AppConsr {
LOGGER.error("调用失败" + e.getMessage(), e); LOGGER.error("调用失败" + e.getMessage(), e);
} }
return map; return map;
} }*/
} }
...@@ -18,8 +18,6 @@ import com.pcloud.resourcecenter.product.dto.UpdateAppProductParamDTO; ...@@ -18,8 +18,6 @@ import com.pcloud.resourcecenter.product.dto.UpdateAppProductParamDTO;
import com.pcloud.resourcecenter.product.entity.Article; import com.pcloud.resourcecenter.product.entity.Article;
import com.pcloud.resourcecenter.product.entity.Product; import com.pcloud.resourcecenter.product.entity.Product;
import com.pcloud.resourcecenter.product.service.ProductService; import com.pcloud.resourcecenter.product.service.ProductService;
import com.pcloud.resourcecenter.store.dto.SinglePageInfoDTO;
import com.pcloud.resourcecenter.store.service.StoreService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -53,8 +51,6 @@ public class ProductConsr { ...@@ -53,8 +51,6 @@ public class ProductConsr {
@Autowired @Autowired
private ProductService productService; private ProductService productService;
@Autowired
private StoreService storeService;
/** /**
* 微信端,资源中心拉取商品信息 * 微信端,资源中心拉取商品信息
...@@ -533,7 +529,7 @@ public class ProductConsr { ...@@ -533,7 +529,7 @@ public class ProductConsr {
* @Author zhuyajie * @Author zhuyajie
* @Date 17:21 2022/3/14 * @Date 17:21 2022/3/14
**/ **/
public Map<Long, SinglePageInfoDTO> mapSinglePageByIds(List<Long> singlePageIds) { /*public Map<Long, SinglePageInfoDTO> mapSinglePageByIds(List<Long> singlePageIds) {
if (ListUtils.isEmpty(singlePageIds)) { if (ListUtils.isEmpty(singlePageIds)) {
return new HashMap<>(); return new HashMap<>();
} }
...@@ -543,5 +539,5 @@ public class ProductConsr { ...@@ -543,5 +539,5 @@ public class ProductConsr {
LOGGER.error("调用storeService.mapSinglePageByIds失败"+e.getMessage(),e); LOGGER.error("调用storeService.mapSinglePageByIds失败"+e.getMessage(),e);
} }
return new HashMap<>(); return new HashMap<>();
} }*/
} }
...@@ -8,8 +8,6 @@ import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO; ...@@ -8,8 +8,6 @@ import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO;
import com.pcloud.advertising.advertising.dto.AdvertisingSpaceItemDTO; import com.pcloud.advertising.advertising.dto.AdvertisingSpaceItemDTO;
import com.pcloud.analysisengine.browse.dto.BrowseRecordStatisticDTO; import com.pcloud.analysisengine.browse.dto.BrowseRecordStatisticDTO;
import com.pcloud.appcenter.app.dto.AppDto; import com.pcloud.appcenter.app.dto.AppDto;
import com.pcloud.appcenter.app.dto.AppRaysDTO;
import com.pcloud.appcenter.app.dto.app.MapBaseStatusDTO;
import com.pcloud.book.applet.biz.AppletBooklistBiz; import com.pcloud.book.applet.biz.AppletBooklistBiz;
import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz; import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
import com.pcloud.book.applet.biz.AppletRecordAggrStatisBiz; import com.pcloud.book.applet.biz.AppletRecordAggrStatisBiz;
...@@ -159,7 +157,6 @@ import com.pcloud.readercenter.common.enums.YesOrNoNumEnum; ...@@ -159,7 +157,6 @@ import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO; import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
import com.pcloud.resourcecenter.product.dto.ProductDto; import com.pcloud.resourcecenter.product.dto.ProductDto;
import com.pcloud.resourcecenter.product.dto.ProductLabelDto; import com.pcloud.resourcecenter.product.dto.ProductLabelDto;
import com.pcloud.resourcecenter.store.dto.SinglePageInfoDTO;
import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto; import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO; import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO;
...@@ -1325,7 +1322,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -1325,7 +1322,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (ListUtils.isEmpty(itemVOS)) { if (ListUtils.isEmpty(itemVOS)) {
return; return;
} }
List<Long> serveIds = itemVOS.stream().map(ResourcePageItemVO::getServeId).distinct().collect(Collectors.toList()); /*List<Long> serveIds = itemVOS.stream().map(ResourcePageItemVO::getServeId).distinct().collect(Collectors.toList());
Map<Long, SinglePageInfoDTO> singlePageDTOMap = productConsr.mapSinglePageByIds(serveIds); Map<Long, SinglePageInfoDTO> singlePageDTOMap = productConsr.mapSinglePageByIds(serveIds);
if (MapUtils.isEmpty(singlePageDTOMap)) { if (MapUtils.isEmpty(singlePageDTOMap)) {
return; return;
...@@ -1339,7 +1336,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz { ...@@ -1339,7 +1336,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
itemVO.setTransverseImg(singlePageDTO.getImgUrl()); itemVO.setTransverseImg(singlePageDTO.getImgUrl());
} }
itemVO.setResultUrl(itemVO.getLinkUrl()); itemVO.setResultUrl(itemVO.getLinkUrl());
} }*/
} }
@ParamLog("填充平台会员活动") @ParamLog("填充平台会员活动")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment