1

src/main/java/com/cdf/httpClient/response/cdf/CdfProduct.java

@@ -1,5 +1,6 @@
 package com.cdf.httpClient.response.cdf;
 
+import com.cdf.entity.ProductSource;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,5 +18,5 @@ public class CdfProduct implements Serializable {
 
     private String url; //香港详情链接
 
-    private Integer productSourceId =5 ;
+    private ProductSource productSource ;
 }

src/main/java/com/cdf/service/impl/ProductHkServiceImpl.java

@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cdf.common.HKLanguage;
 import com.cdf.common.PageInfo;
 import com.cdf.entity.ProductHk;
+import com.cdf.entity.ProductSource;
 import com.cdf.httpClient.response.cdf.CdfProduct;
 import com.cdf.httpClient.response.cdf.CdfProductListRequest;
 import com.cdf.mapper.IProductHkMapper;
 import com.cdf.service.IProductHkService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cdf.service.IProductSourceService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -28,6 +31,9 @@ import java.util.List;
 @Service
 public class ProductHkServiceImpl extends ServiceImpl<IProductHkMapper, ProductHk> implements IProductHkService {
 
+    @Autowired
+    IProductSourceService productSourceService;
+
     @Override
     public Object pageList(CdfProductListRequest param) {
         LambdaQueryWrapper<ProductHk> wrapper = new LambdaQueryWrapper<>();
@@ -44,6 +50,10 @@ public class ProductHkServiceImpl extends ServiceImpl<IProductHkMapper, ProductH
         wrapper.orderByDesc(ProductHk::getCreateTime);
         Page<ProductHk> page = this.page(new Page<>(param.getPageNum(), 20L), wrapper);
         List<CdfProduct> voList =  this.convert(page.getRecords(),param.getLanguage());
+        ProductSource productSource = productSourceService.getById(5);
+        for (CdfProduct cdfProduct : voList) {
+            cdfProduct.setProductSource(productSource);
+        }
         Page<CdfProduct>  pageVo = new Page<>(param.getPageNum(),20L);
         pageVo.setTotal(page.getTotal());
         pageVo.setRecords(voList);

src/main/java/com/cdf/service/impl/ProductSourceServiceImpl.java

@@ -53,7 +53,7 @@ public class ProductSourceServiceImpl extends ServiceImpl<IProductSourceMapper,
             CdfProductListByIdsVo vos = cdfHKClient.getProductListByIds(productSource.getCdfHost(),productSource.getCdfMchId(),idsRequest);
             List<CdfProduct> productCardList = vos.getProductCardList();
             for (CdfProduct cdfProduct : productCardList) {
-                cdfProduct.setProductSourceId(productSource.getId());
+                cdfProduct.setProductSource(productSource);
             }
             PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), (long) productCardList.size(), (long) productCardList.size(), productCardList);
             return ResultData.ok(pageInfo);
@@ -64,7 +64,7 @@ public class ProductSourceServiceImpl extends ServiceImpl<IProductSourceMapper,
         }
         List<CdfProduct> list = productList.getList();
         for (CdfProduct cdfProduct : list) {
-            cdfProduct.setProductSourceId(productSource.getId());
+            cdfProduct.setProductSource(productSource);
         }
         PageInfo pageInfo = PageInfo.PageInfo(param.getPageIndex(), 20L, productList.getCount()*20, productList.getList());
         return pageInfo;