From f01cf2886e333a99adbc12e7d14887b68b0cad29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Fri, 13 Mar 2026 15:45:50 +0000 Subject: [PATCH] Merge #64 into master from cc_20260313_ws_wallet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:关闭网商开通回调接口验签 * cc_20260313_ws_wallet: (6 commits squashed) - fix:新店开通网商钱包 - fix:网商钱包开通回调修改 - fix - fix - fix:关闭网商开通回调接口验签 - Merge branch 'master' into cc_20260313_ws_wallet # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java # coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/64 --- .../java/com/cool/store/service/wallet/WalletService.java | 2 +- .../cool/store/service/wallet/impl/WalletServiceImpl.java | 5 +++-- .../java/com/cool/store/config/OpenApiValidateFilter.java | 3 ++- .../com/cool/store/controller/webc/MiniWalletController.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java index 3b7c9eaf4..4b384a691 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java @@ -201,5 +201,5 @@ public interface WalletService { /** * 网商充值账户查询 */ - WsPayAccountDTO wsPayAccountQuery(OutStoreIdRequest request); + WsPayAccountDTO wsPayAccountQuery(StoreShopRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java index 961cab09d..ddb0702a0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java @@ -746,8 +746,9 @@ public class WalletServiceImpl implements WalletService { } @Override - public WsPayAccountDTO wsPayAccountQuery(OutStoreIdRequest request) { - return walletApiService.wsPayAccountQuery(request); + public WsPayAccountDTO wsPayAccountQuery(StoreShopRequest request) { + String storeId = getStoreId(request); + return walletApiService.wsPayAccountQuery(new OutStoreIdRequest(storeId)); } public String getStoreId(StoreShopRequest request) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java index 116654044..8417606dd 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java @@ -51,7 +51,8 @@ public class OpenApiValidateFilter implements Filter { private static final Set WHITELIST_URIS = new HashSet<>(Arrays.asList( "/zxjp/open/v1/statusRefresh", "/zxjp/open/v1/getStoreUser", - "/zxjp/open/v1/callback" + "/zxjp/open/v1/callback", + "/zxjp/open/v1/wallet/onlineCommercialBankCallback" )); private static final List oldUrlMapping = new ArrayList<>(Arrays.asList( "/zxjp/open/v1/statusRefresh","/zxjp/open/v1/changePaymentStatus", diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java index bb3290086..7858befc5 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java @@ -155,7 +155,7 @@ public class MiniWalletController { @ApiOperation("网商充值账户查询") @PostMapping("/wsPayAccountQuery") - public ResponseResult wsPayAccountQuery(@RequestBody @Validated OutStoreIdRequest request) { + public ResponseResult wsPayAccountQuery(@RequestBody @Validated StoreShopRequest request) { return ResponseResult.success(walletService.wsPayAccountQuery(request)); } }