lyhzzz 2 years ago
parent
commit
55c0a1d48b

+ 1 - 0
src/main/java/com/cdf/controller/back/HkProductController.java

@@ -44,6 +44,7 @@ public class HkProductController {
             List<String> strings = Arrays.asList(param.getKeyword().split(","));
             param.setProductIds(strings);
         }
+
         return ResultData.ok(productHkService.pageList(param));
     }
 

+ 2 - 0
src/main/java/com/cdf/httpClient/response/cdf/CdfProduct.java

@@ -16,4 +16,6 @@ public class CdfProduct implements Serializable {
     private Integer stock;  //库存数量
 
     private String url; //香港详情链接
+
+    private Integer productSourceId =1 ;
 }

+ 1 - 1
src/main/java/com/cdf/httpClient/response/cdf/CdfProductListRequest.java

@@ -18,7 +18,7 @@ public class CdfProductListRequest {
 
     private String language = "eshop_cn";
 
-    private Integer productSourceId;
+    private Integer productSourceId = 1;
 
 
     public String getKeyword() {

+ 7 - 0
src/main/java/com/cdf/service/impl/ProductSourceServiceImpl.java

@@ -52,6 +52,9 @@ public class ProductSourceServiceImpl extends ServiceImpl<IProductSourceMapper,
             CdfProductListByIdsRequest idsRequest = new CdfProductListByIdsRequest(ids);
             CdfProductListByIdsVo vos = cdfHKClient.getProductListByIds(productSource.getCdfHost(),productSource.getCdfMchId(),idsRequest);
             List<CdfProduct> productCardList = vos.getProductCardList();
+            for (CdfProduct cdfProduct : productCardList) {
+                cdfProduct.setProductSourceId(productSource.getId());
+            }
             PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), (long) productCardList.size(), (long) productCardList.size(), productCardList);
             return ResultData.ok(pageInfo);
         }
@@ -59,6 +62,10 @@ public class ProductSourceServiceImpl extends ServiceImpl<IProductSourceMapper,
         if(productList.getSearchResult().getType() == 4 ){
             throw new BusinessException(productList.getSearchResult().getType(),productList.getSearchResult().getDesc());
         }
+        List<CdfProduct> list = productList.getList();
+        for (CdfProduct cdfProduct : list) {
+            cdfProduct.setProductSourceId(productSource.getId());
+        }
         PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, productList.getCount()*20, productList.getList());
         return pageInfo;
     }