修改旷世sku审核

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterThirdKsService.java

@@ -20,6 +20,13 @@ public interface RemoterThirdKsService {
     @PostMapping("/third-ks/sku-submit")
     R<KsSkuSubmitVo> skuSubmit(@RequestBody KsSkuSubmitDto dto);
 
+    /**
+     * 常规SKU修改
+     */
+    @NoToken
+    @PostMapping("/third-ks/sku-edit")
+    R<KsSkuEditVo> skuEdit(@RequestBody KsSkuEditDto dto, @RequestParam String ks_sku_id);
+
     /**
      * 集合SKU提交审核（未公开）
      */

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/ks/KsSkuEditDto.java

@@ -2,14 +2,12 @@ package com.bsd.pjcloud.thirdparty.dto.ks;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 public class KsSkuEditDto {
 
-    /**
-     * 该字段为超级收银员平台的sku_id，提交SKU审核后由系统返回，作为资源ID传递，是请求地址中的一部分，不需要提交到form表单
-     */
-    private String ks_sku_id;
-
     /**
      * 该字段为使用方系统sku_name，建议使用品牌名+商品名，如统一冰红茶
      */
@@ -23,7 +21,7 @@ public class KsSkuEditDto {
     /**
      * SKU图片仅在SKU因图片原因审核不通过的情况下支持修改，一旦SKU被审核通过，SKU图片将不再允许修改，如有相关需求，请重新申请SKU
      */
-    private String img_urls;
+    private List<String> img_urls;
 
     /**
      * 审核结果回调地址
@@ -33,5 +31,5 @@ public class KsSkuEditDto {
     /**
      * 该字段为SKU所对应的规格，包含口味、容量、重量，taste表示口味，capacity表示容量，单位：ml，weight表示重量，单位：g
      */
-    private String specs;
+    private Map<String, String> specs;
 }

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/ks/KsSkuEditVo.java

@@ -3,7 +3,7 @@ package com.bsd.pjcloud.thirdparty.vo.ks;
 import lombok.Data;
 
 @Data
-public class KsSkuEditVo {
+public class KsSkuEditVo extends KsBaseInnerVo {
 
     /**
      * 该sku_id为使用方sku_id

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ks/ThirdKsApiController.java

@@ -49,10 +49,10 @@ public class ThirdKsApiController {
     }
 
     @Inner
-    @Operation(summary = "SKU审核结果主动获取")
+    @Operation(summary = "常规SKU修改")
     @PostMapping("/sku-edit")
-    public R<KsSkuEditVo> skuEdit(@RequestBody KsSkuEditDto dto) {
-        return R.ok(thirdKsApiService.skuEdit(dto));
+    public R<KsSkuEditVo> skuEdit(@RequestBody KsSkuEditDto dto, String ks_sku_id) {
+        return R.ok(thirdKsApiService.skuEdit(dto, ks_sku_id));
     }
 
     @Inner

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdKsApiService.java

@@ -28,7 +28,7 @@ public interface ThirdKsApiService {
     /**
      * SKU审核结果主动获取
      */
-    KsSkuEditVo skuEdit(KsSkuEditDto dto);
+    KsSkuEditVo skuEdit(KsSkuEditDto dto, String ks_sku_id);
 
     /**
      * SKU删除

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/ks/ThirdKsApiServiceImpl.java

@@ -141,14 +141,32 @@ public class ThirdKsApiServiceImpl implements ThirdKsApiService {
      * SKU审核结果主动获取
      */
     @Override
-    public KsSkuEditVo skuEdit(KsSkuEditDto dto) {
+    public KsSkuEditVo skuEdit(KsSkuEditDto dto, String ks_sku_id) {
+        dto.setNotify_url(ksDiscernConfig.getCallbackBaseUrl() + ksDiscernConfig.getCallbackSkuUrl());
+        String body = JSONUtil.toJsonStr(dto);
         long startTime = System.currentTimeMillis();
         KsBaseVo ksBaseVo = new KsBaseVo();
-        KsApi.Api api = KsApi.SKU_EDIT.setBaseUrl(ksDiscernConfig.getBaseUrl()).setParams(BeanUtil.beanToMap(dto));
+        KsApi.Api api = KsApi.SKU_EDIT.setBaseUrl(ksDiscernConfig.getBaseUrl())
+                .setpath(ks_sku_id)
+                .setBody(body)
+                .setAccessKey(ksDiscernConfig.getAccessKey())
+                .setSecretKey(ksDiscernConfig.getSecretKey())
+                .setHost(ksDiscernConfig.getHost());
         ThirdDoorLogEntity logEntity = api.getInitLogEntity();
         logEntity.setReq(JSONUtil.toJsonStr(dto));
         try {
-
+            api.setBody(body);
+            String res = api.getHttpRequest().execute().body();
+            if (ObjectUtil.isEmpty(res)) throw new RuntimeException("response响应为空");
+            logEntity.setRes(res);
+            ksBaseVo = JSONUtil.toBean(res, KsBaseVo.class);
+            if (!ksBaseVo.isSuccess()) {
+                String errorLog = String.format("请求错误res|%s|url|%s|", res, api);
+                log.error(errorLog);
+                KsSkuEditVo errorVo = new KsSkuEditVo();
+                errorVo.setMessage(ksBaseVo.getMsg());
+                return errorVo;
+            }
         } catch (Exception e) {
             String error = String.format("|%s||skuEdit|意外的错误error|%s|stack|%s|", TAG, e.getMessage(), Arrays.toString(e.getStackTrace()));
             log.error(error);