lyhzzz 1 jaar geleden
bovenliggende
commit
4b33260313

+ 5 - 4
src/main/java/com/cdf/controller/api/CdfHkProductApiController.java

@@ -10,6 +10,7 @@ import com.cdf.httpClient.client.CdfClient;
 import com.cdf.httpClient.client.CdfHKClient;
 import com.cdf.httpClient.request.CdfInCatRequest;
 import com.cdf.httpClient.response.cdf.CdfProductVo;
+import com.cdf.response.SkuListVo;
 import com.cdf.service.IProductSourceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping("/api")
@@ -78,10 +80,9 @@ public class CdfHkProductApiController {
          * 会员购店:12
          * https://ar.cdfmembers.com/spu?showType=makeup&spuId=p15685542&storeId=1&userId=601131887&AccessToken=05508E6249DF10D42876C63E6823E98AAFCA8B1CD592F0D5B5A112BF3B51BB01BD5C8661A63D9D16039DA34FD0352B184F892FAB146A3531&cookieId=24fb1f47-cf3f-4a3d-c0fe-62be0c99a400
          */
-        JSONArray skuList = cdfHKClient.getSkuList(productId, productSourceId);
-        for (Object o : skuList) {
-            JSONObject obj = (JSONObject) o;
-            obj.put("url",obj.getString("url") + "&spuId=" + productId +"&storeId="+productSource);
+        List<SkuListVo> skuList = cdfHKClient.getSkuList(productId, productSourceId);
+        for (SkuListVo o : skuList) {
+            o.setUrl(o.getUrl() + "&spuId=" + productId +"&storeId="+productSource);
         }
         productById.setSkuList(skuList);
         return ResultData.ok(productById);

+ 4 - 1
src/main/java/com/cdf/httpClient/client/CdfHKClient.java

@@ -5,8 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.cdf.httpClient.request.CdfChannelclick;
 import com.cdf.httpClient.request.CdfInCatRequest;
 import com.cdf.httpClient.response.cdf.*;
+import com.cdf.response.SkuListVo;
 import com.dtflys.forest.annotation.*;
 
+import java.util.List;
+
 public interface CdfHKClient {
 
     /**
@@ -80,5 +83,5 @@ public interface CdfHKClient {
      * 获取商品试装信息
      */
     @Get(url = "https://ar-admin.cdfmembers.com/api/getSkuList")
-    JSONArray getSkuList(@Query("spuId")String spuId, @Query("storeId") Integer storeId);
+    List<SkuListVo> getSkuList(@Query("spuId")String spuId, @Query("storeId") Integer storeId);
 }

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

@@ -1,6 +1,7 @@
 package com.cdf.httpClient.response.cdf;
 
 import com.alibaba.fastjson.JSONArray;
+import com.cdf.response.SkuListVo;
 import lombok.Data;
 
 import java.util.List;
@@ -17,6 +18,6 @@ public class CdfProductVo {
     private Integer saleChannel = 0;    //购买渠道,0或没有返回为普通在线渠道购买 ,1:仅支持门店购买
     private String shopDetailDto;
 
-    private JSONArray skuList;
+    private List<SkuListVo> skuList;
 
 }

+ 9 - 0
src/main/java/com/cdf/response/SkuListVo.java

@@ -0,0 +1,9 @@
+package com.cdf.response;
+
+import lombok.Data;
+
+@Data
+public class SkuListVo {
+    private String skuId;
+    private String url;
+}