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

Merge branch 'cc_20251112_wallet' into 'master'

Browse Source 
Cc 20251112 wallet

See merge request hangzhou/java/custom_zxjp!196
This commit is contained in:
苏竹红
2025-11-28 08:47:13 +00:00
parent 23eb77a317 cea7fe70ea
commit 0f3bafd5ee
5 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.java
View File

@@ -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;

5
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PasswordDTO.java
View File

@@ -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;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountInfoVO.java
View File

@@ -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;

4
coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountPageVO.java
View File

@@ -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;

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

@@ -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<AccountInfoDTO> 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());