From 33181f188f7351570c7cf3a5222ebc3d11d221e0 Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 24 Nov 2025 10:26:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=AD=98=E9=87=8F=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E7=BD=91=E5=95=86=E6=96=B0=E5=A2=9E=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E6=9C=89=E6=95=88=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/wallet/OpenBankInfoMapper.xml | 4 ++++ .../java/com/cool/store/entity/wallet/OpenBankInfoDO.java | 6 ++++++ .../cool/store/request/wallet/CoolOpenBasicInfoRequest.java | 3 +++ .../store/request/wallet/OldStoreAccountCreateRequest.java | 3 +++ .../cool/store/service/wallet/impl/WalletServiceImpl.java | 1 + 5 files changed, 17 insertions(+) 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/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..b985fe179 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("法人身份证有效期字段") + 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()); From e5c59b3839b6d6af8793f6435ac31f71ef8ce83a Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 24 Nov 2025 10:29:43 +0800 Subject: [PATCH 2/3] fix --- .../com/cool/store/request/wallet/CoolOpenBasicInfoRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b985fe179..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,7 +83,7 @@ public class CoolOpenBasicInfoRequest { @ApiModelProperty(value = "法人身份证号码") private String legalIdCard; - @ApiModelProperty("法人身份证有效期字段") + @ApiModelProperty("法人身份证有效期字段，yyyy-MM-dd") private String legalIdCardExpireTime; /** From be84221cf08a2de3be0d11b35e5bf1046bf30cbf Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 24 Nov 2025 13:42:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E5=AD=97=E6=AE=B5=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dto/wallet/BillDetailDTO.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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; + }