From 3899c58c6b83a5b06a60f19dd86eac202b81f0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cxxxxxxx=E8=AF=A6?= <286460656@qq.com> Date: Thu, 31 Aug 2023 17:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms/api/dto/auth/MemberAuthCallBackRequestDTO.java | 4 ++++ .../com/ms/api/dto/move/GetProductInfoRequestDTO.java | 4 ++-- .../java/com/ms/api/spi/move/GetProductInfoService.java | 8 +++++--- .../api/spi/move/SearchChoicenessSourceItemService.java | 7 ++++--- .../ms/api/spi/move/SearchDSProductCatTreeService.java | 9 +++++---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ms-api/src/main/java/com/ms/api/dto/auth/MemberAuthCallBackRequestDTO.java b/ms-api/src/main/java/com/ms/api/dto/auth/MemberAuthCallBackRequestDTO.java index 242ba7e1..6300fef7 100644 --- a/ms-api/src/main/java/com/ms/api/dto/auth/MemberAuthCallBackRequestDTO.java +++ b/ms-api/src/main/java/com/ms/api/dto/auth/MemberAuthCallBackRequestDTO.java @@ -23,4 +23,8 @@ public class MemberAuthCallBackRequestDTO { * 过期时间 */ private String gmtMemberExpireTime; + + private String url; + + private String body; } diff --git a/ms-api/src/main/java/com/ms/api/dto/move/GetProductInfoRequestDTO.java b/ms-api/src/main/java/com/ms/api/dto/move/GetProductInfoRequestDTO.java index 38b97db7..3ab45a27 100644 --- a/ms-api/src/main/java/com/ms/api/dto/move/GetProductInfoRequestDTO.java +++ b/ms-api/src/main/java/com/ms/api/dto/move/GetProductInfoRequestDTO.java @@ -13,10 +13,10 @@ public class GetProductInfoRequestDTO { /** * 来源商品ID */ - private List productId; + private String productId; /** * authCode */ - private List authCode; + private String authCode; } diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/GetProductInfoService.java b/ms-biz/src/main/java/com/ms/api/spi/move/GetProductInfoService.java index faa46414..f27ad2b5 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/GetProductInfoService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/GetProductInfoService.java @@ -1,5 +1,7 @@ package com.ms.api.spi.move; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.jinritemai.cloud.base.api.BaseRequest; import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; @@ -24,13 +26,13 @@ import java.util.HashMap; */ @ExtensionService("getProductInfo") @Slf4j -public class GetProductInfoService extends SPIBaseService implements ExtensionServiceHandler { +public class GetProductInfoService extends SPIBaseService implements ExtensionServiceHandler { @Autowired private DsJsonRequestTemplate dsJsonRequestTemplate; @Override - public BaseResponse handle(BaseRequest req) { + public BaseResponse handle(BaseRequest req) { initHandle(req); // ----参数校验---- GetProductInfoRequestDTO fields = req.getData(); @@ -52,6 +54,6 @@ public class GetProductInfoService extends SPIBaseService implements ExtensionSe } // ----结果返回---- - return R.ok(res); + return R.ok(JSON.parseObject(res)); } } diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/SearchChoicenessSourceItemService.java b/ms-biz/src/main/java/com/ms/api/spi/move/SearchChoicenessSourceItemService.java index 92f1e580..68aad8b9 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/SearchChoicenessSourceItemService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/SearchChoicenessSourceItemService.java @@ -2,6 +2,7 @@ package com.ms.api.spi.move; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.jinritemai.cloud.base.api.BaseRequest; import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; @@ -22,13 +23,13 @@ import java.util.HashMap; */ @ExtensionService("searchChoicenessSourceItem") @Slf4j -public class SearchChoicenessSourceItemService extends SPIBaseService implements ExtensionServiceHandler { +public class SearchChoicenessSourceItemService extends SPIBaseService implements ExtensionServiceHandler { @Autowired private DsJsonRequestTemplate dsJsonRequestTemplate; @Override - public BaseResponse handle(BaseRequest req) { + public BaseResponse handle(BaseRequest req) { initHandle(req); // ----参数校验---- SearchChoicenessSourceItemRequestDTO fields = req.getData(); @@ -57,6 +58,6 @@ public class SearchChoicenessSourceItemService extends SPIBaseService implements } // ----结果返回---- - return R.ok(res); + return R.ok(JSON.parseObject(res)); } } diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/SearchDSProductCatTreeService.java b/ms-biz/src/main/java/com/ms/api/spi/move/SearchDSProductCatTreeService.java index ae28418e..85fe1b0a 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/SearchDSProductCatTreeService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/SearchDSProductCatTreeService.java @@ -1,5 +1,7 @@ package com.ms.api.spi.move; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.jinritemai.cloud.base.api.BaseRequest; import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; @@ -22,14 +24,13 @@ import java.util.HashMap; */ @ExtensionService("searchDSProductCatTree") @Slf4j -public class SearchDSProductCatTreeService extends SPIBaseService implements ExtensionServiceHandler { +public class SearchDSProductCatTreeService extends SPIBaseService implements ExtensionServiceHandler { @Autowired private DsJsonRequestTemplate dsJsonRequestTemplate; @Override - public BaseResponse handle(BaseRequest req) { - initHandle(req); + public BaseResponse handle(BaseRequest req) { // ----参数校验---- SearchDSProductCatTreeRequestDTO fields = req.getData(); @@ -47,6 +48,6 @@ public class SearchDSProductCatTreeService extends SPIBaseService implements Ext } // ----结果返回---- - return R.ok(res); + return R.ok(JSON.parseObject(res)); } }