diff --git a/coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml index 4c8834cb8..8dc80689b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml @@ -18,6 +18,7 @@ + @@ -71,6 +72,9 @@ legal_id_card = #{dto.legalIdCard}, + + legal_id_card_expire_time = #{dto.legalIdCardExpireTime}, + legal_phone = #{dto.legalPhone}, 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 7462678d6..5a007ebfb 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 @@ -37,11 +37,26 @@ public class BillDetailDTO { */ private Integer feeItemId; + /** + * 费用科目名称 + */ + private String feeItemName; + /** * 门店账户编号 */ private String storeAccountNo; + /** + * 交易对方账户编号 + */ + private String transAccountNo; + + /** + * 交易对方账户名称 + */ + private String transAccountName; + /** * 公司编号 */ @@ -77,4 +92,9 @@ public class BillDetailDTO { */ private Integer tradeType; + /** + * 交易发起时间 + */ + private String createTime; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java index 011f5392c..529da0b4e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java @@ -86,6 +86,12 @@ public class OpenBankInfoDO { @Column(name = "legal_id_card") private String legalIdCard; + /** + * 法人身份证有效期字段 + */ + @Column(name = "legal_id_card_expire_time") + private String legalIdCardExpireTime; + /** * 法人手机号 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java index 6d82a8d71..3442ce34d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java @@ -83,6 +83,9 @@ public class CoolOpenBasicInfoRequest { @ApiModelProperty(value = "法人身份证号码") private String legalIdCard; + @ApiModelProperty("法人身份证有效期字段,yyyy-MM-dd") + private String legalIdCardExpireTime; + /** * 法人手机号 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/OldStoreAccountCreateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/OldStoreAccountCreateRequest.java index e3b67b5fe..96aef77e3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/OldStoreAccountCreateRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/wallet/OldStoreAccountCreateRequest.java @@ -32,6 +32,9 @@ public class OldStoreAccountCreateRequest { @ApiModelProperty(value = "法人证件号码", required = true) private String legalNo; + @ApiModelProperty("法人身份证有效期字段") + private String legalIdcardExpireTime; + @ApiModelProperty(value = "法人联系电话(企业与个体户必传)") private String legalPhone; 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 c12d687a2..5cc8246f1 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 @@ -552,6 +552,7 @@ public class WalletServiceImpl implements WalletService { oldStoreAccountCreateRequest.setLegalName(request.getLegalName()); oldStoreAccountCreateRequest.setLegalNo(request.getLegalIdCard()); oldStoreAccountCreateRequest.setLegalPhone(request.getLegalPhone()); + oldStoreAccountCreateRequest.setLegalIdcardExpireTime(request.getLegalIdCardExpireTime()); //账户简称使用营业执照名称 oldStoreAccountCreateRequest.setAccountAliasName(request.getBusinessLicenseName()); oldStoreAccountCreateRequest.setAccountCardNo(request.getSettlementCard());