Merge branch 'master' of https://codeup.aliyun.com/64d9c5feeceb191898f636d7/honor-dd-light-ds-java

README.md

@@ -5,8 +5,8 @@ curl --location --request POST 'localhost:8080/base/cloud/spi' \
 --data-raw '{
 "appId":"7264840234423027259",
 "authId":"4463798",
-"method":"testSpi",
-"data":"{\"sourceChannelCode\":\"query_none_less\",\"pageSize\":20,\"pageNo\":1}"
+"method":"getFreightTemplateList",
+"data":"{}"
 }'
 
 

ms-api/src/main/java/com/ms/api/dto/move/GetFreightTemplateListRequestDTO.java

@@ -0,0 +1,22 @@
+package com.ms.api.dto.move;
+
+import lombok.Data;
+
+/*
+ *  获取店铺模板 请求参数
+ */
+@Data
+public class GetFreightTemplateListRequestDTO {
+    /**
+     * 运费模板名称，支持模糊搜索（例：模版1）
+     */
+    private String name;
+    /**
+     * 分页参数
+     */
+    private String page;
+    /**
+     * 分页参数
+     */
+    private String size = "100";
+}

ms-api/src/main/java/com/ms/api/dto/move/SearchChoicenessSourceItemRequestDTO.java

@@ -20,6 +20,11 @@ public class SearchChoicenessSourceItemRequestDTO {
      */
     private Integer topCid;
 
+    /**
+     * 二级类目ID
+     */
+    private Integer cid;
+
     /**
      * 排序default/saleCntAsc/saleCntDesc/priceAsc/priceDesc
      */

ms-biz/src/main/java/com/ms/api/TestSpiService.java

@@ -11,6 +11,7 @@ import com.ms.api.common.Ret;
 import com.ms.api.common.SPIBaseService;
 import com.ms.api.dto.ItemDTO;
 import com.ms.api.tool.DsJsonRequestTemplate;
+import com.ms.api.tool.SecurityTool;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -32,7 +33,7 @@ public class TestSpiService extends SPIBaseService implements ExtensionServiceHa
         getAuthCode();
         String res = null;
         HashMap<String, Object> params = new HashMap<>();
-        params.put("platformItemId", "1");
+        params.put("platformItemId", SecurityTool.encodeByAES("1"));
         params.put("sourceItemId", "33");
         params.put("authCode", authCode);
         try {

ms-biz/src/main/java/com/ms/api/spi/move/GetFreightTemplateList.java

@@ -0,0 +1,49 @@
+package com.ms.api.spi.move;
+
+import com.doudian.open.api.freightTemplate_list.data.FreightTemplateListData;
+import com.doudian.open.api.freightTemplate_list.param.FreightTemplateListParam;
+import com.doudian.open.api.product_isv_getClueList.data.ProductIsvGetClueListData;
+import com.doudian.open.api.product_isv_getClueList.param.ProductIsvGetClueListParam;
+import com.jinritemai.cloud.base.api.BaseRequest;
+import com.jinritemai.cloud.base.api.BaseResponse;
+import com.jinritemai.cloud.base.api.ExtensionService;
+import com.jinritemai.cloud.base.api.ExtensionServiceHandler;
+import com.ms.api.common.R;
+import com.ms.api.common.Ret;
+import com.ms.api.common.SPIBaseService;
+import com.ms.api.dto.move.GetFreightTemplateListRequestDTO;
+import com.ms.api.dto.move.GetShopCloudHotProductsRequestDTO;
+import com.ms.api.tool.DsJsonRequestTemplate;
+import com.ms.api.util.DdRequestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 获取店铺模板列表
+ */
+@ExtensionService("getFreightTemplateList")
+@Slf4j
+public class GetFreightTemplateList extends SPIBaseService implements ExtensionServiceHandler<GetFreightTemplateListRequestDTO, Ret> {
+    @Override
+    public BaseResponse<Ret> handle(BaseRequest<GetFreightTemplateListRequestDTO> req) {
+        initHandle(req);
+        // ----参数校验----
+        GetFreightTemplateListRequestDTO fields =  req.getData();
+
+        // ----逻辑校验----
+
+        // ----业务处理----
+        FreightTemplateListParam param = new FreightTemplateListParam();
+        param.setSize(fields.getSize());
+        FreightTemplateListData data = DdRequestUtil.FreightTemplateListDataRequest(param);
+        Map<String, Object> result = new HashMap<>();
+        result.put("data", data.getList());
+        result.put("total", data.getCount());
+
+        // ----结果返回----
+        return R.ok(Ret.success(result));
+    }
+}

ms-biz/src/main/java/com/ms/api/spi/move/GetShopCloudHotProductsService.java

@@ -26,10 +26,6 @@ import java.util.Map;
 @ExtensionService("getShopCloudHotProducts")
 @Slf4j
 public class GetShopCloudHotProductsService extends SPIBaseService implements ExtensionServiceHandler<GetShopCloudHotProductsRequestDTO, Ret> {
-
-    @Autowired
-    private DsJsonRequestTemplate dsJsonRequestTemplate;
-
     @Override
     public BaseResponse<Ret> handle(BaseRequest<GetShopCloudHotProductsRequestDTO> req) {
         initHandle(req);

ms-biz/src/main/java/com/ms/api/spi/move/SaveBatchMoveTaskService.java

@@ -1,5 +1,6 @@
 package com.ms.api.spi.move;
 
+import com.doudian.open.api.freightTemplate_list.FreightTemplateListRequest;
 import com.jinritemai.cloud.base.api.BaseRequest;
 import com.jinritemai.cloud.base.api.BaseResponse;
 import com.jinritemai.cloud.base.api.ExtensionService;

ms-biz/src/main/java/com/ms/api/spi/move/SearchChoicenessSourceItemService.java

@@ -42,6 +42,7 @@ public class SearchChoicenessSourceItemService extends SPIBaseService implements
         HashMap<String, Object> params = new HashMap<>();
         params.put("keyword",fields.getKeyword());
         params.put("topCid",fields.getTopCid());
+        params.put("cid",fields.getCid());
         params.put("sort",fields.getSort());
         params.put("ruleIds", fields.getRuleIds());
         params.put("isHideMoved",fields.getIsHideMoved());

ms-biz/src/main/java/com/ms/api/util/DdRequestUtil.java

@@ -8,6 +8,10 @@ import com.doudian.open.api.afterSale_Detail.AfterSaleDetailRequest;
 import com.doudian.open.api.afterSale_Detail.AfterSaleDetailResponse;
 import com.doudian.open.api.afterSale_Detail.data.AfterSaleDetailData;
 import com.doudian.open.api.afterSale_Detail.param.AfterSaleDetailParam;
+import com.doudian.open.api.freightTemplate_list.FreightTemplateListRequest;
+import com.doudian.open.api.freightTemplate_list.FreightTemplateListResponse;
+import com.doudian.open.api.freightTemplate_list.data.FreightTemplateListData;
+import com.doudian.open.api.freightTemplate_list.param.FreightTemplateListParam;
 import com.doudian.open.api.order_BatchSearchIndex.OrderBatchSearchIndexRequest;
 import com.doudian.open.api.order_BatchSearchIndex.OrderBatchSearchIndexResponse;
 import com.doudian.open.api.order_BatchSearchIndex.data.OrderBatchSearchIndexData;
@@ -200,4 +204,21 @@ public class DdRequestUtil {
         }
         throw new RuntimeException(String.format("抖店请求错误:msg:%s,code:%s,subCode:%s,subMsg:%s,", response.getMsg(), response.getCode(), response.getSubCode(), response.getSubMsg()));
     }
+
+    public static FreightTemplateListData FreightTemplateListDataRequest(FreightTemplateListParam param) {
+        String activeProfile= System.getenv("sys-deploy-env");
+        if (!"Prod".equals(activeProfile)){
+            AuthThreadLocalUtil.set(AppConst.TEST_SHOP_ID);
+        }
+        FreightTemplateListRequest request = new FreightTemplateListRequest();
+        request.setParam(param);
+        log.info("=============Dd请求餐素:{}===================", JSONObject.toJSONString(param));
+        FreightTemplateListResponse response = request.execute();
+        log.info("=============Dd请求返回:{}===================", JSONObject.toJSONString(response));
+        boolean success = CommonTool.checkDdApiRequestIsSuccess(response);
+        if (success && ObjectUtil.isNotEmpty(response.getData())) {
+            return response.getData();
+        }
+        throw new RuntimeException(String.format("抖店请求错误:msg:%s,code:%s,subCode:%s,subMsg:%s,", response.getMsg(), response.getCode(), response.getSubCode(), response.getSubMsg()));
+    }
 }