From a1a3b525168f56043451682a9f05e759a7694642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 3 Dec 2025 09:36:25 +0000 Subject: [PATCH] Merge #1 into master from cc_20251112_wallet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:钱包提现返回结果修改 * cc_20251112_wallet: (1 commits squashed) - fix:钱包提现返回结果修改 Signed-off-by: 苏竹红 Reviewed-by: 苏竹红 Merged-by: 苏竹红 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/1 --- .../java/com/cool/store/service/wallet/WalletService.java | 2 +- .../com/cool/store/service/wallet/impl/WalletServiceImpl.java | 4 ++-- .../com/cool/store/controller/webc/MiniWalletController.java | 3 ++- 3 files changed, 5 insertions(+), 4 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 584a4027b..30e74973b 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 @@ -149,7 +149,7 @@ public interface WalletService { * @param request 钱包提现Request * @return 是否成功 */ - Boolean withDrawer(WalletWithDrawerRequest request); + WithDrawerDTO withDrawer(WalletWithDrawerRequest 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 46bc1f2d7..fc6c3598e 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 @@ -451,7 +451,7 @@ public class WalletServiceImpl implements WalletService { } @Override - public Boolean withDrawer(WalletWithDrawerRequest request) { + public WithDrawerDTO withDrawer(WalletWithDrawerRequest request) { String storeId = getStoreId(request); String reqNo = UUIDUtils.get32UUID(); WithDrawerRequest withDrawerRequest = new WithDrawerRequest(storeId, request.getPayPwd(), reqNo, request.getAmount().toString(), "提现", request.getWalletType()); @@ -467,7 +467,7 @@ public class WalletServiceImpl implements WalletService { .orderStatus(1) .build(); walletPaymentOrderDAO.insertSelective(orderDO); - return true; + return withdraw; } @Override 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 c59d49f12..c5a2644d7 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 @@ -3,6 +3,7 @@ package com.cool.store.controller.webc; import com.cool.store.dto.wallet.OpenBasicInfoDTO; import com.cool.store.dto.wallet.PasswordDTO; import com.cool.store.dto.wallet.TradeRecordDTO; +import com.cool.store.dto.wallet.WithDrawerDTO; import com.cool.store.request.wallet.*; import com.cool.store.response.ResponseResult; import com.cool.store.service.wallet.WalletService; @@ -116,7 +117,7 @@ public class MiniWalletController { @ApiOperation("提现") @PostMapping("/withDrawer") - public ResponseResult withDrawer(@RequestBody @Validated WalletWithDrawerRequest request) { + public ResponseResult withDrawer(@RequestBody @Validated WalletWithDrawerRequest request) { return ResponseResult.success(walletService.withDrawer(request)); } @ApiOperation("根据门店编码查询开通基础信息")