|
@@ -13,10 +13,7 @@ import com.cdf.httpClient.request.FdkkHotRequest;
|
|
import com.cdf.httpClient.request.FdkkUploadRequest;
|
|
import com.cdf.httpClient.request.FdkkUploadRequest;
|
|
import com.cdf.httpClient.request.SceneRequest;
|
|
import com.cdf.httpClient.request.SceneRequest;
|
|
import com.cdf.httpClient.response.FdkkResponse;
|
|
import com.cdf.httpClient.response.FdkkResponse;
|
|
-import com.cdf.httpClient.response.cdf.CdfProduct;
|
|
|
|
-import com.cdf.httpClient.response.cdf.CdfProductListRequest;
|
|
|
|
-import com.cdf.httpClient.response.cdf.CdfProductListResponse;
|
|
|
|
-import com.cdf.httpClient.response.cdf.CdfProductVo;
|
|
|
|
|
|
+import com.cdf.httpClient.response.cdf.*;
|
|
import com.cdf.service.IFdkkUserService;
|
|
import com.cdf.service.IFdkkUserService;
|
|
import com.cdf.service.IHotRelationService;
|
|
import com.cdf.service.IHotRelationService;
|
|
import com.cdf.util.FileUtils;
|
|
import com.cdf.util.FileUtils;
|
|
@@ -149,28 +146,15 @@ public class FdkkSceneEditService {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
JSONArray jsonArray = JSONObject.parseArray(relationIds);
|
|
JSONArray jsonArray = JSONObject.parseArray(relationIds);
|
|
- List<CdfProduct> products = new ArrayList<>();
|
|
|
|
- for (Object o : jsonArray) {
|
|
|
|
- String productId = (String) o;
|
|
|
|
- CdfProductListRequest param = new CdfProductListRequest();
|
|
|
|
- param.setKeyword(productId);
|
|
|
|
- CdfProductListResponse productList = cdfClient.getProductList(param);
|
|
|
|
- if(productList == null || productList.getSearchResult()==null || productList.getSearchResult().getType()!=0){
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- CdfProductVo cdfProductVo = cdfClient.getProductById(productId);
|
|
|
|
- if(cdfProductVo == null || cdfProductVo.getState()==null || cdfProductVo.getState()!=0){
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- List<CdfProduct> list = productList.getList();
|
|
|
|
- for (CdfProduct cdfProduct : list) {
|
|
|
|
- cdfProduct.setSkus(cdfProductVo.getSkus());
|
|
|
|
- }
|
|
|
|
- products.addAll(list);
|
|
|
|
|
|
+ if(jsonArray == null || jsonArray.size() <=0){
|
|
|
|
+ continue;
|
|
}
|
|
}
|
|
- if(products.size() >0){
|
|
|
|
- tag.put("products",products);
|
|
|
|
|
|
+ CdfProductListByIdsRequest param = new CdfProductListByIdsRequest(jsonArray);
|
|
|
|
+ CdfProductListByIdsVo vos = cdfClient.getProductListByIds(param);
|
|
|
|
+ if(vos.getProductCardList()!=null && vos.getProductCardList().size() >0){
|
|
|
|
+ tag.put("products",vos.getProductCardList());
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
return tags;
|
|
return tags;
|