From 85761cef6391d588672515793ae06e06bf1041c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 27 Nov 2025 18:32:24 +0800 Subject: [PATCH 1/3] feat:setBusinessLicensePhoto --- .../com/cool/store/service/wallet/impl/WalletServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 957bef749..6fb7437ad 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 @@ -510,6 +510,7 @@ public class WalletServiceImpl implements WalletService { openBasicInfoDTO.setSignerIdCardFront(openBankInfo.getSignerIdCardFront()); openBasicInfoDTO.setSignerIdCardBack(openBankInfo.getSignerIdCardBack()); openBasicInfoDTO.setBusinessLicenseName(openBankInfo.getBusinessLicenseName()); + openBasicInfoDTO.setBusinessLicensePhoto(openBankInfo.getBusinessLicensePhoto()); openBasicInfoDTO.setBusinessLicenseCode(openBankInfo.getBusinessLicenseCode()); openBasicInfoDTO.setSettlementCard(openBankInfo.getSettlementCard()); openBasicInfoDTO.setBankBranchName(openBankInfo.getBankBranchName()); From 2531761830271d710f38f1792e980978add943aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 27 Nov 2025 20:28:51 +0800 Subject: [PATCH 2/3] feat:existPassword --- .../main/java/com/cool/store/dto/wallet/PasswordDTO.java | 5 +++++ .../store/service/wallet/impl/WalletServiceImpl.java | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java index b39e71c89..826997b0a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java @@ -1,5 +1,6 @@ package com.cool.store.dto.wallet; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,9 +10,13 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class PasswordDTO { @ApiModelProperty(value = "密码是否已存在 1.存在 2.不存在", required = true) private Integer isExist; + @ApiModelProperty(value = "是否已存在账户 1.存在 2.不存在", required = true) + private Boolean isExistAccount; + } 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 6fb7437ad..46bc1f2d7 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 @@ -378,7 +378,14 @@ public class WalletServiceImpl implements WalletService { @Override public PasswordDTO existPassword(OutStoreIdRequest request) { - return walletApiService.passwordIsExist( request); + PasswordDTO passwordDTO = walletApiService.passwordIsExist(request); + List list = walletApiService.getAccountInfo(request); + Boolean isExistAccount = false; + if (CollectionUtils.isNotEmpty( list)){ + isExistAccount = Boolean.TRUE; + } + passwordDTO.setIsExistAccount(isExistAccount); + return passwordDTO; } @Override From cea7fe70eacea9bca7c32d693f0f760b48cc1624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 28 Nov 2025 09:11:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E8=B4=A6=E6=88=B7=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dto/wallet/AccountInfoDTO.java | 3 +++ .../src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java | 3 +++ .../src/main/java/com/cool/store/vo/wallet/AccountPageVO.java | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java index e953b4381..84069a95c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java @@ -66,6 +66,9 @@ public class AccountInfoDTO { @ApiModelProperty(value = "账户余额", required = true) private String totalAmount; + @ApiModelProperty(value = "可提现余额", required = true) + private String withdrawAmount; + @ApiModelProperty(value = "打标状态 0 未打标 1 已打标", required = true) private Integer labelingStatus; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java index b7245a73a..96ef50043 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java @@ -37,6 +37,9 @@ public class AccountInfoVO { @ApiModelProperty(value = "账户余额") private String totalAmount; + @ApiModelProperty(value = "可提现余额", required = true) + private String withdrawAmount; + @ApiModelProperty(value = "打标状态 0 未打标 1 已打标") private Integer labelingStatus; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPageVO.java index df54bbd6a..ffb478e9e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPageVO.java @@ -66,6 +66,10 @@ public class AccountPageVO { @ApiModelProperty(value = "账户余额", required = true) private String totalAmount; + @ApiModelProperty(value = "可提现余额", required = true) + private String withdrawAmount; + + @ApiModelProperty(value = "打标状态 0 未打标 1 已打标", required = true) private Integer labelingStatus;