open-source/payment-spring-boot
1
0
Fork 0
mirror of https://github.com/dromara/payment-spring-boot.git synced 2026-03-13 21:33:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

#109

Browse Source
This commit is contained in:
xiafang
2023-11-28 13:50:53 +08:00
parent 616ea0cede
commit 56bf43f04f
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/ecommerce/ApplymentApi.java
View File

@@ -19,18 +19,26 @@ package cn.felord.payment.wechat.v3.ecommerce;
import cn.felord.payment.wechat.enumeration.WeChatServer; import cn.felord.payment.wechat.enumeration.WeChatServer;
import cn.felord.payment.wechat.enumeration.WechatPayV3Type; import cn.felord.payment.wechat.enumeration.WechatPayV3Type;
import cn.felord.payment.wechat.v3.*; import cn.felord.payment.wechat.v3.AbstractApi;
import cn.felord.payment.wechat.v3.model.ecommerce.*; import cn.felord.payment.wechat.v3.SignatureProvider;
import cn.felord.payment.wechat.v3.WechatPartnerSpecialMchApi;
import cn.felord.payment.wechat.v3.WechatPayClient;
import cn.felord.payment.wechat.v3.WechatResponseEntity;
import cn.felord.payment.wechat.v3.X509WechatCertificateInfo;
import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceAccountInfo;
import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceApplymentParams;
import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceContactInfo;
import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceIdCardInfo;
import cn.felord.payment.wechat.v3.model.ecommerce.EcommerceIdDocInfo;
import cn.felord.payment.wechat.v3.model.ecommerce.UboInfo;
import cn.felord.payment.wechat.v3.model.specmch.SubMchModifyParams; import cn.felord.payment.wechat.v3.model.specmch.SubMchModifyParams;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
import java.net.URI; import java.net.URI;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.List;
/** /**
* 电商收付通-商户进件 * 电商收付通-商户进件
@@ -149,13 +157,18 @@ public class ApplymentApi extends AbstractApi {
idDocInfo.setIdDocAddress(signatureProvider.encryptRequestMessage(idDocAddress, x509Certificate)); idDocInfo.setIdDocAddress(signatureProvider.encryptRequestMessage(idDocAddress, x509Certificate));
} }
} }
List<UboInfoListItem> uboInfoList = applymentParams.getUboInfoList(); UboInfo uboInfo = applymentParams.getUboInfo();
if (!CollectionUtils.isEmpty(uboInfoList)) { if (uboInfo != null) {
uboInfoList.forEach(uboInfoListItem -> { UboInfo.IdCardInfo cardInfo = uboInfo.getIdCardInfo();
uboInfoListItem.setUboIdDocName(signatureProvider.encryptRequestMessage(uboInfoListItem.getUboIdDocName(), x509Certificate)); if (cardInfo != null) {
uboInfoListItem.setUboIdDocNumber(signatureProvider.encryptRequestMessage(uboInfoListItem.getUboIdDocNumber(), x509Certificate)); cardInfo.setIdCardName(signatureProvider.encryptRequestMessage(cardInfo.getIdCardName(), x509Certificate));
uboInfoListItem.setUboIdDocAddress(signatureProvider.encryptRequestMessage(uboInfoListItem.getUboIdDocAddress(), x509Certificate)); cardInfo.setIdCardNumber(signatureProvider.encryptRequestMessage(cardInfo.getIdCardNumber(), x509Certificate));
}); }
UboInfo.IdDocInfo docInfo = uboInfo.getIdDocInfo();
if (docInfo != null) {
docInfo.setIdDocName(signatureProvider.encryptRequestMessage(docInfo.getIdDocName(), x509Certificate));
docInfo.setIdDocNumber(signatureProvider.encryptRequestMessage(docInfo.getIdDocNumber(), x509Certificate));
}
} }
EcommerceAccountInfo accountInfo = applymentParams.getAccountInfo(); EcommerceAccountInfo accountInfo = applymentParams.getAccountInfo();
if (accountInfo != null) { if (accountInfo != null) {

6
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ecommerce/EcommerceApplymentParams.java
View File

@@ -20,9 +20,6 @@ import cn.felord.payment.wechat.enumeration.ContactType;
import cn.felord.payment.wechat.enumeration.IdDocType; import cn.felord.payment.wechat.enumeration.IdDocType;
import cn.felord.payment.wechat.v3.model.specmch.FinanceInstitutionInfo; import cn.felord.payment.wechat.v3.model.specmch.FinanceInstitutionInfo;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* 二级商户进件申请API请求参数 * 二级商户进件申请API请求参数
* *
@@ -42,7 +39,8 @@ public class EcommerceApplymentParams{
private EcommerceIdCardInfo idCardInfo; private EcommerceIdCardInfo idCardInfo;
private EcommerceIdDocInfo idDocInfo; private EcommerceIdDocInfo idDocInfo;
private Boolean owner; private Boolean owner;
private List<UboInfoListItem> uboInfoList; private UboInfo uboInfo;
private Boolean needAccountInfo;
private EcommerceAccountInfo accountInfo; private EcommerceAccountInfo accountInfo;
private EcommerceContactInfo contactInfo; private EcommerceContactInfo contactInfo;
private SalesSceneInfo salesSceneInfo; private SalesSceneInfo salesSceneInfo;

2
payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ecommerce/EcommerceContactInfo.java
View File

@@ -17,6 +17,7 @@
package cn.felord.payment.wechat.v3.model.ecommerce; package cn.felord.payment.wechat.v3.model.ecommerce;
import cn.felord.payment.wechat.enumeration.IdDocType;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
@@ -25,6 +26,7 @@ import java.time.LocalDate;
public class EcommerceContactInfo { public class EcommerceContactInfo {
private String contactType; private String contactType;
private String contactName; private String contactName;
private IdDocType contactIdDocType;
private String contactIdCardNumber; private String contactIdCardNumber;
private String contactIdDocCopy; private String contactIdDocCopy;
private String contactIdDocCopyBack; private String contactIdDocCopyBack;