|
@@ -58,23 +58,21 @@ public class OpenAPIController {
|
|
|
this.validateAuthToken(authToken);
|
|
|
|
|
|
log.info("苏豪通请求产品列表 parameter: {}", apiRequest);
|
|
|
+
|
|
|
QueryWrapper<AdwebSite> adwebSiteQueryWrapper = new QueryWrapper<>();
|
|
|
adwebSiteQueryWrapper.like("domain", apiRequest.getDomain());
|
|
|
List<AdwebSite> adwebSites =
|
|
|
adwebSiteService.getBaseMapper().selectList(adwebSiteQueryWrapper);
|
|
|
|
|
|
- List<ProductInfoVO> productVOList;
|
|
|
if (CollectionUtils.isNotEmpty(adwebSites)) {
|
|
|
QueryWrapper<AdwebProduct> adwebProductQueryWrapper = new QueryWrapper<>();
|
|
|
adwebSiteQueryWrapper.eq("domain", adwebSites.get(0).getCode());
|
|
|
List<AdwebProduct> adwebProducts =
|
|
|
adwebProductService.getBaseMapper().selectList(adwebProductQueryWrapper);
|
|
|
- productVOList = adwebProducts.stream().map(ProductInfoVO::fromAdwebProduct).toList();
|
|
|
+ return Result.ok(adwebProducts.stream().map(ProductInfoVO::fromAdwebProduct).toList());
|
|
|
} else {
|
|
|
return Result.error("未找到该站点!");
|
|
|
}
|
|
|
-
|
|
|
- return Result.ok(productVOList);
|
|
|
}
|
|
|
|
|
|
/** 外部api请求获取询盘列表 */
|
|
@@ -94,7 +92,6 @@ public class OpenAPIController {
|
|
|
adwebSiteService.getBaseMapper().selectList(adwebSiteQueryWrapper);
|
|
|
|
|
|
EnquiryPageVO enquiryPage = new EnquiryPageVO();
|
|
|
-
|
|
|
if (CollectionUtils.isNotEmpty(adwebSites)) {
|
|
|
Page<AdwebEnquiry> page = new Page<>(apiRequest.getPageNo(), apiRequest.getPageSize());
|
|
|
|
|
@@ -104,7 +101,6 @@ public class OpenAPIController {
|
|
|
IPage<AdwebEnquiry> pageList = adwebEnquiryService.page(page, enquiryQueryWrapper);
|
|
|
|
|
|
if (pageList != null && CollectionUtils.isNotEmpty(pageList.getRecords())) {
|
|
|
-
|
|
|
// 复制属性到需要返回的新对象
|
|
|
List<EnquiryInfoVO> enquiryInfoVOS =
|
|
|
pageList.getRecords().stream()
|
|
@@ -117,7 +113,6 @@ public class OpenAPIController {
|
|
|
enquiryPage.setTotal(pageList.getTotal());
|
|
|
enquiryPage.setRecords(enquiryInfoVOS);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
return Result.error("未找到该站点!");
|
|
|
}
|