diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountAuthenticationDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountAuthenticationDTO.java index e5de9cf48..bde8f4c5a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountAuthenticationDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountAuthenticationDTO.java @@ -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; 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 11154caa5..b43e4babd 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 @@ -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) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountNoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountNoDTO.java index c78f890d7..2dec0858a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountNoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountNoDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java index d8a8c78aa..3cddbc142 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AddTagDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AddTagDTO.java index 0408d50d8..7bc352de4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AddTagDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AddTagDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.java index 9375c398f..221953dfa 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class BankDTO { @ApiModelProperty("银行编号") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankListDTO.java index a7441adf3..f6ffec419 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankListDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BankListDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDetailDTO.java index 645437024..7462678d6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDetailDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillDetailDTO.java @@ -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 { /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java index e1e6a6e92..d438734ef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java @@ -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 { /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.java index 42bc48c7b..18aa95d27 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class CompanyDTO { @ApiModelProperty(value = "公司编号") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyListDTO.java index 073944367..26dba0dd6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyListDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/CompanyListDTO.java @@ -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 pageData; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.java index f95e440cf..48cf39f83 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/LargePaymentDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class LargePaymentDTO { @ApiModelProperty(value = "外部门店唯一标识", required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.java index aac3aa8bd..acc9b5a14 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDTO.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; @@ -12,6 +13,7 @@ import java.util.List; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class PaymentDTO { @ApiModelProperty(name = "外部门店唯一标识", required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.java index c20e7492a..4cd9c03d8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/PaymentDetailDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class PaymentDetailDTO { @ApiModelProperty(value = "打款金额", required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.java index f35ac842b..7f3fd0dbb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/StoreAccountDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class StoreAccountDTO { /** diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.java index 61c649aac..563a2aea2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TransferDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class TransferDTO { @ApiModelProperty(value="业务系统付款单号(如 CRM 单号)",required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.java index bdbeabb3b..820d2b696 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/WithDrawerDTO.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,6 +10,7 @@ import lombok.Data; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class WithDrawerDTO { @ApiModelProperty(value = "门店ID",required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillDetailRequest.java index fbff673cd..6eaa89cf4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/BillDetailRequest.java @@ -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(转账交易编号二选一)") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CreateStoreAndAccountRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CreateStoreAndAccountRequest.java index a399d395b..231f74b78 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CreateStoreAndAccountRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CreateStoreAndAccountRequest.java @@ -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) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/UpdateStoreAccountRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/UpdateStoreAccountRequest.java index ed37eef29..5f6d41169 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/UpdateStoreAccountRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/UpdateStoreAccountRequest.java @@ -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) 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 092049b48..4fbb87a53 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 @@ -69,13 +69,13 @@ 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()) .build(); StoreAccountDTO storeAndAccount = walletApiService.createStoreAndAccount(accountRequest); - return StringUtils.isNotBlank(storeAndAccount.getAccountId()); + return StringUtils.isNotBlank(storeAndAccount.getAccountNo()); } @Override