Merge branch 'test'

src/main/java/com/cdf/controller/api/CdfHkProductApiController.java

@@ -1,5 +1,6 @@
 package com.cdf.controller.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
@@ -9,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;
@@ -18,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")
@@ -69,6 +72,19 @@ public class CdfHkProductApiController {
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
         CdfProductVo productById = cdfHKClient.getProductById(productSource.getCdfHost(),productSource.getCdfMchId(),productId);
+
+        /**
+         * 澳门店：1
+         * 东涌店：2
+         * 柬中免店：3
+         * 会员购店：12
+         * https://ar.cdfmembers.com/spu?showType=makeup&spuId=p15685542&storeId=1&userId=601131887&AccessToken=05508E6249DF10D42876C63E6823E98AAFCA8B1CD592F0D5B5A112BF3B51BB01BD5C8661A63D9D16039DA34FD0352B184F892FAB146A3531&cookieId=24fb1f47-cf3f-4a3d-c0fe-62be0c99a400
+         */
+        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);
     }
 }

src/main/java/com/cdf/httpClient/client/CdfHKClient.java

@@ -1,13 +1,14 @@
 package com.cdf.httpClient.client;
 
+import com.alibaba.fastjson.JSONArray;
 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.dtflys.forest.annotation.Get;
-import com.dtflys.forest.annotation.JSONBody;
-import com.dtflys.forest.annotation.Post;
-import com.dtflys.forest.annotation.Var;
+import com.cdf.response.SkuListVo;
+import com.dtflys.forest.annotation.*;
+
+import java.util.List;
 
 public interface CdfHKClient {
 
@@ -78,4 +79,9 @@ public interface CdfHKClient {
                 "ymt-pars: appid=71&accesstoken={accessToken}&userid={userId}&mchId={mchId}&language=zh_CN&format=json",
         })
     JSONObject channelclick(@Var("host")String host,@Var("mchId") String mchId,@Var("cookieId") String cookieId, @Var("accessToken") String accessToken, @Var("userId")String userId, @JSONBody CdfChannelclick request);
+    /**
+     * 获取商品试装信息
+     */
+    @Get(url = "https://ar-admin.cdfmembers.com/api/getSkuList")
+    List<SkuListVo> getSkuList(@Query("spuId")String spuId, @Query("storeId") Integer storeId);
 }

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

@@ -1,5 +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;
@@ -16,4 +18,6 @@ public class CdfProductVo {
     private Integer saleChannel = 0;    //购买渠道，0或没有返回为普通在线渠道购买 ,1:仅支持门店购买
     private String shopDetailDto;
 
+    private List<SkuListVo> skuList;
+
 }

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;
+}