suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #64 into master from cc_20260313_ws_wallet

Browse Source 
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/64
This commit is contained in:
王非凡
2026-03-13 15:45:50 +00:00
committed by 正新
parent f1f0295906
commit f01cf2886e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
View File

@@ -201,5 +201,5 @@ public interface WalletService {
/** /**
* 网商充值账户查询 * 网商充值账户查询
*/ */
WsPayAccountDTO wsPayAccountQuery(OutStoreIdRequest request); WsPayAccountDTO wsPayAccountQuery(StoreShopRequest request);
} }

5
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
View File

@@ -746,8 +746,9 @@ public class WalletServiceImpl implements WalletService {
} }
@Override @Override
public WsPayAccountDTO wsPayAccountQuery(OutStoreIdRequest request) { public WsPayAccountDTO wsPayAccountQuery(StoreShopRequest request) {
return walletApiService.wsPayAccountQuery(request); String storeId = getStoreId(request);
return walletApiService.wsPayAccountQuery(new OutStoreIdRequest(storeId));
} }
public String getStoreId(StoreShopRequest request) { public String getStoreId(StoreShopRequest request) {

3
coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
View File

@@ -51,7 +51,8 @@ public class OpenApiValidateFilter implements Filter {
private static final Set<String> WHITELIST_URIS = new HashSet<>(Arrays.asList( private static final Set<String> WHITELIST_URIS = new HashSet<>(Arrays.asList(
"/zxjp/open/v1/statusRefresh", "/zxjp/open/v1/statusRefresh",
"/zxjp/open/v1/getStoreUser", "/zxjp/open/v1/getStoreUser",
"/zxjp/open/v1/callback" "/zxjp/open/v1/callback",
"/zxjp/open/v1/wallet/onlineCommercialBankCallback"
)); ));
private static final List<String> oldUrlMapping = new ArrayList<>(Arrays.asList( private static final List<String> oldUrlMapping = new ArrayList<>(Arrays.asList(
"/zxjp/open/v1/statusRefresh","/zxjp/open/v1/changePaymentStatus", "/zxjp/open/v1/statusRefresh","/zxjp/open/v1/changePaymentStatus",

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java
View File

@@ -155,7 +155,7 @@ public class MiniWalletController {
@ApiOperation("网商充值账户查询") @ApiOperation("网商充值账户查询")
@PostMapping("/wsPayAccountQuery") @PostMapping("/wsPayAccountQuery")
public ResponseResult<WsPayAccountDTO> wsPayAccountQuery(@RequestBody @Validated OutStoreIdRequest request) { public ResponseResult<WsPayAccountDTO> wsPayAccountQuery(@RequestBody @Validated StoreShopRequest request) {
return ResponseResult.success(walletService.wsPayAccountQuery(request)); return ResponseResult.success(walletService.wsPayAccountQuery(request));
} }
} }