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:
苏竹红
2025-11-24 13:44:58 +08:00
parent 07207847eb be84221cf0
commit 9bc035fffd
6 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/wallet/OpenBankInfoMapper.xml
View File

@@ -18,6 +18,7 @@
<result column="legal_is_signer" jdbcType="TINYINT" property="legalIsSigner" />
<result column="legal_name" jdbcType="VARCHAR" property="legalName" />
<result column="legal_id_card" jdbcType="VARCHAR" property="legalIdCard" />
<result column="legal_id_card_expire_time" jdbcType="VARCHAR" property="legalIdCardExpireTime" />
<result column="legal_phone" jdbcType="VARCHAR" property="legalPhone" />
<result column="legal_id_card_front" jdbcType="VARCHAR" property="legalIdCardFront" />
<result column="legal_id_card_back" jdbcType="VARCHAR" property="legalIdCardBack" />
@@ -71,6 +72,9 @@
<if test="dto.legalIdCard != null and dto.legalIdCard != ''">
legal_id_card = #{dto.legalIdCard},
</if>
<if test="dto.legalIdCardExpireTime != null and dto.legalIdCardExpireTime != ''">
legal_id_card_expire_time = #{dto.legalIdCardExpireTime},
</if>
<if test="dto.legalPhone != null and dto.legalPhone != ''">
legal_phone = #{dto.legalPhone},
</if>

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

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

6
coolstore-partner-model/src/main/java/com/cool/store/entity/wallet/OpenBankInfoDO.java
View File

@@ -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;
/**
* 法人手机号
*/

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

@@ -83,6 +83,9 @@ public class CoolOpenBasicInfoRequest {
@ApiModelProperty(value = "法人身份证号码")
private String legalIdCard;
@ApiModelProperty("法人身份证有效期字段，yyyy-MM-dd")
private String legalIdCardExpireTime;
/**
* 法人手机号
*/

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

@@ -32,6 +32,9 @@ public class OldStoreAccountCreateRequest {
@ApiModelProperty(value = "法人证件号码", required = true)
private String legalNo;
@ApiModelProperty("法人身份证有效期字段")
private String legalIdcardExpireTime;
@ApiModelProperty(value = "法人联系电话(企业与个体户必传)")
private String legalPhone;

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

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