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/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-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; 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..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 @@ -510,6 +517,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());