修改密码，退出登录

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

@@ -0,0 +1,31 @@
+package com.cdf.controller.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cdf.common.ResultData;
+import com.cdf.httpClient.client.CdfClient;
+import com.cdf.httpClient.request.CdfInCatRequest;
+import com.cdf.httpClient.response.cdf.CdfProductVo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/api")
+public class CdfProductApiController {
+
+    @Resource
+    private CdfClient cdfClient;
+
+    @GetMapping("/getCatNum")
+    public ResultData getCatNum(@RequestParam(required = false) String accessToken){
+        JSONObject catNum = cdfClient.getCatNum(accessToken);
+        return  ResultData.ok(catNum);
+    }
+    @GetMapping("/inCat")
+    public ResultData inCat(@RequestParam(required = false) String accessToken,
+                            @RequestParam(required = false) String skuId,
+                            @RequestParam(required = false) Integer num){
+        JSONObject jsonObject = cdfClient.inCat(accessToken, new CdfInCatRequest(skuId, num));
+        return ResultData.ok(jsonObject);
+    }
+}

src/main/java/com/cdf/controller/back/TestController.java

@@ -2,11 +2,8 @@ package com.cdf.controller.back;
 
 import com.cdf.common.ResultData;
 import com.cdf.httpClient.client.CdfClient;
-import com.cdf.httpClient.response.cdf.CdfProduct;
 import com.cdf.httpClient.response.cdf.CdfProductListRequest;
-import com.cdf.httpClient.response.cdf.CdfProductVo;
 import com.cdf.schedule.ScheduleTask;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -34,8 +31,8 @@ public class TestController {
         return ResultData.ok(cdfClient.getProductList(param));
     }
     @RequestMapping("/test/getCatNum")
-    public ResultData getCatNum(){
-        return ResultData.ok(cdfClient.getCatNum());
+    public ResultData getCatNum(@RequestParam(required = false) String accessToken){
+        return ResultData.ok(cdfClient.getCatNum(accessToken));
     }
 
     @RequestMapping("/test/task")
@@ -50,7 +47,6 @@ public class TestController {
 
     @RequestMapping("/test/one")
     public ResultData test1() throws Exception{
-        System.out.println(1/0);
         return ResultData.ok();
     }
 }

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

@@ -1,6 +1,7 @@
 package com.cdf.httpClient.client;
 
 import com.alibaba.fastjson.JSONObject;
+import com.cdf.httpClient.request.CdfInCatRequest;
 import com.cdf.httpClient.response.cdf.CdfProductListRequest;
 import com.cdf.httpClient.response.cdf.CdfProductListResponse;
 import com.cdf.httpClient.response.cdf.CdfProductVo;
@@ -34,7 +35,17 @@ public interface CdfClient {
         headers = {
             "app-key: h5sqBuyer_600667208",
             "app-version: 6.6.88",
-            "ymt-pars: appid=71&accesstoken=C10DBE77A888E4592F2EBAEDC252C0A4279DF95858B3DBBF271513CE83F44FE90E39CC0AA7E08823D671F0A359B2AE8971A3DDAEFCC522A7&mchId=600667208&language=zh_CN&format=json",
+            "ymt-pars: appid=71&accesstoken={accessToken}&mchId=600667208&language=zh_CN&format=json",
         })
-    JSONObject getCatNum();
+    JSONObject getCatNum(@Var("accessToken") String accessToken);
+    /**
+     * 加入购物车
+     */
+    @Post(url = "/api/trading/sqscartprod",
+        headers = {
+            "app-key: h5sqBuyer_600667208",
+            "app-version: 6.6.88",
+            "ymt-pars: appid=71&accesstoken={accessToken}&mchId=600667208&language=zh_CN&format=json",
+        })
+    JSONObject inCat(@Var("accessToken") String accessToken, @JSONBody CdfInCatRequest request);
 }

src/main/java/com/cdf/httpClient/request/CdfInCatRequest.java

@@ -0,0 +1,18 @@
+package com.cdf.httpClient.request;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class CdfInCatRequest {
+    private String catalogid;               //商品规格id
+    private Integer purchasenum;            //数量
+    private Integer deliverytype = 999;
+    private Boolean checked = true;
+
+    public CdfInCatRequest(String catalogid, Integer purchasenum) {
+        this.catalogid = catalogid;
+        this.purchasenum = purchasenum;
+    }
+}

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

@@ -8,4 +8,7 @@ public class CdfSkus {
     private Integer original;       //原始价格
     private Integer price;          //销售价格
     private Integer stockStatus;    //库存状态：0为无库存，1为少量库存，2为大量库存
+    private String pic;             //规格图片
+    private Integer stock;          //库存
+    private String stockDesc;       //库存信息
 }

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

@@ -16,6 +16,7 @@ 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.service.IFdkkUserService;
 import com.cdf.service.IHotRelationService;
 import com.cdf.util.JwtUtil;
@@ -130,17 +131,16 @@ public class FdkkSceneEditService {
                 continue;
             }
             JSONArray jsonArray = JSONObject.parseArray(relationIds);
-            List<CdfProduct> products = new ArrayList<>();
+            List<CdfProductVo> 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.getSearchResult().getType() == 0 && productList.getList().size() >0){
-                    CdfProduct cdfProduct = productList.getList().get(0);
-                    products.add(cdfProduct);
+                CdfProductVo cdfProductVo = cdfClient.getProductById(productId);
+                if(cdfProductVo == null || cdfProductVo.getState()==null || cdfProductVo.getState()!=0){
+                    continue;
                 }
-
+                products.add(cdfProductVo);
             }
             if(products.size() >0){
                 tag.put("products",products);

src/main/resources/application.yaml

@@ -18,4 +18,14 @@ server:
 tlog:
   enable-invoke-time-print: true
 user:
-  default-password: 88888888
+  default-password: 88888888
+
+forest:
+  ## 日志总开关，打开/关闭Forest请求/响应日志（默认为 true）
+  log-enabled: true
+  ## 打开/关闭Forest请求日志（默认为 true）
+  log-request: true
+  ## 打开/关闭Forest响应状态日志（默认为 true）
+  log-response-status: true
+  ## 打开/关闭Forest响应内容日志（默认为 false）
+  log-response-content: true