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

Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet

Browse Source
This commit is contained in:
wangff
2025-11-17 10:06:44 +08:00
parent 026dab78ff aedea2dc59
commit 387e20873e
21 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AccountAuthenticationDTO {
private Integer accountStatus;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountInfoDTO.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;
@@ -11,6 +12,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AccountInfoDTO {
@ApiModelProperty(value = "结算卡业务类型 枚举值：1：对公 2：对私", required = true)

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AccountNoDTO {
private String accountNo;

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AccountVerifyDTO {
private String outStoreId;

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AddTagDTO {
private Integer status;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BankDTO {
@ApiModelProperty("银行编号")

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

@@ -1,6 +1,7 @@
package com.cool.store.dto.wallet;
import com.cool.store.request.wallet.WalletBasicPageInfo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BankListDTO {
WalletBasicPageInfo page;

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BillDetailDTO {
/**

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

@@ -1,5 +1,6 @@
package com.cool.store.dto.wallet;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
/**
@@ -8,6 +9,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BillPageDTO {
/**

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class CompanyDTO {
@ApiModelProperty(value = "公司编号")

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

@@ -1,6 +1,7 @@
package com.cool.store.dto.wallet;
import com.cool.store.request.wallet.WalletBasicPageInfo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class CompanyListDTO {
private List<CompanyDTO> pageData;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class LargePaymentDTO {
@ApiModelProperty(value = "外部门店唯一标识", required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.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;
@@ -12,6 +13,7 @@ import java.util.List;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class PaymentDTO {
@ApiModelProperty(name = "外部门店唯一标识", required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class PaymentDetailDTO {
@ApiModelProperty(value = "打款金额", required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class StoreAccountDTO {
/**

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class TransferDTO {
@ApiModelProperty(value="业务系统付款单号(如 CRM 单号)",required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.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,6 +10,7 @@ import lombok.Data;
* @Version 1.0
*/
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class WithDrawerDTO {
@ApiModelProperty(value = "门店ID",required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillDetailRequest.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.request.wallet;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description 门店签约账户转账提现查询接口
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
* @Date 2025/11/14 10:05
* @Version 1.0
*/
@Data
public class BillDetailRequest {
@ApiModelProperty(value = "转账交易Id(转账交易编号二选一)")

2
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CreateStoreAndAccountRequest.java
View File

@@ -36,7 +36,7 @@ public class CreateStoreAndAccountRequest {
@ApiModelProperty(name = "账户简称", required = true)
private String accountAliasName;
@ApiModelProperty(name = "结算银行卡号", required = true)
private String accountCardno;
private String accountCardNo;
@ApiModelProperty(name = "结算卡银行预留手机号", required = true)
private String accountPhone;
@ApiModelProperty(name = "支行编号", required = true)

2
coolstore-partner-model/src/main/java/com/cool/store/request/wallet/UpdateStoreAccountRequest.java
View File

@@ -18,7 +18,7 @@ public class UpdateStoreAccountRequest {
@ApiModelProperty(name = "签约人姓名(对私结算卡必传)以上二选一",required = true)
private String accountName;
@ApiModelProperty(name = "结算银行卡号",required = true)
private String accountCardno;
private String accountCardNo;
@ApiModelProperty(name = "结算卡银行预留手机号。",required = true)
private String accountPhone;
@ApiModelProperty(name = "支行编号",required = true)

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

@@ -70,7 +70,7 @@ public class WalletServiceImpl implements WalletService {
.legalName(request.getUserName())
.legalNo(request.getIdCardNo())
.accountAliasName(request.getUserName() + "_" + shopInfo.getStoreId())
.accountCardno(request.getBankNumber())
.accountCardNo(request.getBankNumber())
.accountPhone(request.getBankMobile())
.bankNo(request.getBankNo())
.bankName(request.getBankName())