Skip to content

Commit 0ecb871

Browse files
Matrix-XMatrix-X
authored
Merge pull request #579 from ArtisanCloud/develop
Develop
2 parents 2b12ec3 + 6806b84 commit 0ecb871

File tree

2 files changed

+169
-116
lines changed

2 files changed

+169
-116
lines changed

‎src/payment/apply4Sub/client.go

Lines changed: 57 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,71 @@ func (comp *Client) ApplyForBusiness(ctx context.Context, params *request.Reques
5151
if err != nil {
5252
return nil, err
5353
}
54-
params.ContactInfo.ContactEmail = string(buffer)
54+
params.ContactInfo.ContactEmail = buffer
55+
56+
// 加密params.ContactInfo.ContactName
57+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.ContactInfo.ContactName))
58+
buffer = base64.StdEncoding.EncodeToString(cipherData)
59+
if err != nil {
60+
return nil, err
61+
}
62+
params.ContactInfo.ContactName = buffer
63+
64+
// 加密params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardNumber
65+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardNumber))
66+
buffer = base64.StdEncoding.EncodeToString(cipherData)
67+
if err != nil {
68+
return nil, err
69+
}
70+
params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardNumber = buffer
71+
72+
// 加密params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardName
73+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardName))
74+
buffer = base64.StdEncoding.EncodeToString(cipherData)
75+
if err != nil {
76+
return nil, err
77+
}
78+
params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardName = buffer
79+
80+
// 加密params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardAddress
81+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardAddress))
82+
buffer = base64.StdEncoding.EncodeToString(cipherData)
83+
if err != nil {
84+
return nil, err
85+
}
86+
params.SubjectInfo.IdentityInfo.IdCardInfo.IdCardAddress = buffer
87+
88+
// 加密params.ContactInfo.mobile_phone
89+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.ContactInfo.MobilePhone))
90+
buffer = base64.StdEncoding.EncodeToString(cipherData)
91+
if err != nil {
92+
return nil, err
93+
}
94+
params.ContactInfo.MobilePhone = buffer
95+
96+
// 加密params.BankAccountInfo.AccountName
97+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.BankAccountInfo.AccountName))
98+
buffer = base64.StdEncoding.EncodeToString(cipherData)
99+
if err != nil {
100+
return nil, err
101+
}
102+
params.BankAccountInfo.AccountName = buffer
103+
104+
// 加密params.BankAccountInfo.AccountNumber
105+
cipherData, err = rsaSigner.RSAEncryptor.Encrypt([]byte(params.BankAccountInfo.AccountNumber))
106+
buffer = base64.StdEncoding.EncodeToString(cipherData)
55107
if err != nil {
56108
return nil, err
57109
}
110+
params.BankAccountInfo.AccountNumber = buffer
58111

59112
// 结构体转化
60113
options, err := object.StructToHashMap(params)
61114
if err != nil {
62115
return nil, err
63116
}
64117

65-
endpoint := "/v3/applyment4sub/applyment"
118+
endpoint := "/v3/applyment4sub/applyment/"
66119
_, err = comp.Request(ctx, comp.Wrap(endpoint), nil, http.MethodPost, options, false, nil, result)
67120
return result, err
68121
}
@@ -74,7 +127,7 @@ func (comp *Client) GetApplyByBusinessCode(ctx context.Context, businessCode str
74127
result := &response.ResponseGetApplyForBusiness{}
75128

76129
endpoint := "/v3/applyment4sub/applyment/business_code/" + businessCode
77-
_, err := comp.Request(ctx, endpoint, &object.StringMap{}, http.MethodGet, &object.HashMap{}, false, nil, result)
130+
_, err := comp.Request(ctx, endpoint, nil, http.MethodGet, &object.HashMap{}, false, nil, result)
78131
return result, err
79132
}
80133

@@ -85,6 +138,6 @@ func (comp *Client) GetApplyByApplymentId(ctx context.Context, applymentId strin
85138
result := &response.ResponseGetApplyForBusiness{}
86139

87140
endpoint := "/v3/applyment4sub/applyment/applyment_id/" + applymentId
88-
_, err := comp.Request(ctx, endpoint, &object.StringMap{}, http.MethodGet, &object.HashMap{}, false, nil, result)
141+
_, err := comp.Request(ctx, endpoint, nil, http.MethodGet,&object.HashMap{}, false, nil, result)
89142
return result, err
90143
}

‎src/payment/apply4Sub/request/requestApplyment.go

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -3,129 +3,129 @@ package request
33
type RequestApplyForBusiness struct {
44
BusinessCode string `json:"business_code"`
55
ContactInfo struct {
6-
BusinessAuthorizationLetter string `json:"business_authorization_letter"`
7-
ContactEmail string `json:"contact_email"`
8-
ContactIdDocCopy string `json:"contact_id_doc_copy"`
9-
ContactIdDocCopyBack string `json:"contact_id_doc_copy_back"`
10-
ContactIdDocType string `json:"contact_id_doc_type"`
11-
ContactIdNumber string `json:"contact_id_number"`
12-
ContactName string `json:"contact_name"`
13-
ContactPeriodBegin string `json:"contact_period_begin"`
14-
ContactPeriodEnd string `json:"contact_period_end"`
15-
ContactType string `json:"contact_type"`
16-
MobilePhone string `json:"mobile_phone"`
17-
Openid string `json:"openid"`
18-
} `json:"contact_info"`
6+
BusinessAuthorizationLetter string `json:"business_authorization_letter,omitempty"`
7+
ContactEmail string `json:"contact_email,omitempty"`
8+
ContactIdDocCopy string `json:"contact_id_doc_copy,omitempty"`
9+
ContactIdDocCopyBack string `json:"contact_id_doc_copy_back,omitempty"`
10+
ContactIdDocType string `json:"contact_id_doc_type,omitempty"`
11+
ContactIdNumber string `json:"contact_id_number,omitempty"`
12+
ContactName string `json:"contact_name,omitempty"`
13+
ContactPeriodBegin string `json:"contact_period_begin,omitempty"`
14+
ContactPeriodEnd string `json:"contact_period_end,omitempty"`
15+
ContactType string `json:"contact_type,omitempty"`
16+
MobilePhone string `json:"mobile_phone,omitempty"`
17+
Openid string `json:"openid,omitempty"`
18+
} `json:"contact_info,omitempty"`
1919
SubjectInfo struct {
20-
SubjectType string `json:"subject_type"`
20+
SubjectType string `json:"subject_type,omitempty"`
2121
FinanceInstitution bool `json:"finance_institution"`
2222
BusinessLicenseInfo struct {
23-
LegalPerson string `json:"legal_person"`
24-
LicenseAddress string `json:"license_address"`
25-
LicenseCopy string `json:"license_copy"`
26-
LicenseNumber string `json:"license_number"`
27-
MerchantName string `json:"merchant_name"`
28-
PeriodBegin string `json:"period_begin"`
29-
PeriodEnd string `json:"period_end"`
30-
} `json:"business_license_info"`
31-
CertificateLetterCopy string `json:"certificate_letter_copy"`
32-
FinanceInstitutionInfo struct {
33-
FinanceLicensePics []string `json:"finance_license_pics"`
34-
FinanceType string `json:"finance_type"`
35-
} `json:"finance_institution_info"`
23+
LegalPerson string `json:"legal_person,omitempty"`
24+
LicenseAddress string `json:"license_address,omitempty"`
25+
LicenseCopy string `json:"license_copy,omitempty"`
26+
LicenseNumber string `json:"license_number,omitempty"`
27+
MerchantName string `json:"merchant_name,omitempty"`
28+
PeriodBegin string `json:"period_begin,omitempty"`
29+
PeriodEnd string `json:"period_end,omitempty"`
30+
} `json:"business_license_info,omitempty"`
31+
CertificateLetterCopy string `json:"certificate_letter_copy,omitempty"`
32+
FinanceInstitutionInfo *struct {
33+
FinanceLicensePics []string `json:"finance_license_pics,omitempty"`
34+
FinanceType string `json:"finance_type,omitempty"`
35+
} `json:"finance_institution_info,omitempty"`
3636
IdentityInfo struct {
37-
AuthorizeLetterCopy string `json:"authorize_letter_copy"`
37+
AuthorizeLetterCopy string `json:"authorize_letter_copy,omitempty"`
3838
IdCardInfo struct {
39-
CardPeriodBegin string `json:"card_period_begin"`
40-
CardPeriodEnd string `json:"card_period_end"`
41-
IdCardAddress string `json:"id_card_address"`
42-
IdCardCopy string `json:"id_card_copy"`
43-
IdCardName string `json:"id_card_name"`
44-
IdCardNational string `json:"id_card_national"`
45-
IdCardNumber string `json:"id_card_number"`
46-
} `json:"id_card_info"`
47-
IdDocInfo struct {
48-
IdDocCopy string `json:"id_doc_copy"`
49-
IdDocCopyBack string `json:"id_doc_copy_back"`
50-
IdDocName string `json:"id_doc_name"`
51-
IdDocNumber string `json:"id_doc_number"`
52-
IdDocAddress string `json:"id_doc_address"`
53-
DocPeriodBegin string `json:"doc_period_begin"`
54-
DocPeriodEnd string `json:"doc_period_end"`
55-
} `json:"id_doc_info"`
56-
IdDocType string `json:"id_doc_type"`
57-
IdHolderType string `json:"id_holder_type"`
39+
CardPeriodBegin string `json:"card_period_begin,omitempty"`
40+
CardPeriodEnd string `json:"card_period_end,omitempty"`
41+
IdCardAddress string `json:"id_card_address,omitempty"`
42+
IdCardCopy string `json:"id_card_copy,omitempty"`
43+
IdCardName string `json:"id_card_name,omitempty"`
44+
IdCardNational string `json:"id_card_national,omitempty"`
45+
IdCardNumber string `json:"id_card_number,omitempty"`
46+
} `json:"id_card_info,omitempty"`
47+
IdDocInfo *struct {
48+
IdDocCopy string `json:"id_doc_copy,omitempty"`
49+
IdDocCopyBack string `json:"id_doc_copy_back,omitempty"`
50+
IdDocName string `json:"id_doc_name,omitempty"`
51+
IdDocNumber string `json:"id_doc_number,omitempty"`
52+
IdDocAddress string `json:"id_doc_address,omitempty"`
53+
DocPeriodBegin string `json:"doc_period_begin,omitempty"`
54+
DocPeriodEnd string `json:"doc_period_end,omitempty"`
55+
} `json:"id_doc_info,omitempty"`
56+
IdDocType string `json:"id_doc_type,omitempty"`
57+
IdHolderType string `json:"id_holder_type,omitempty"`
5858
Owner bool `json:"owner"`
59-
} `json:"identity_info"`
59+
} `json:"identity_info,omitempty"`
6060
UboInfoList []struct {
61-
UboIdDocAddress string `json:"ubo_id_doc_address"`
62-
UboIdDocCopy string `json:"ubo_id_doc_copy"`
63-
UboIdDocCopyBack string `json:"ubo_id_doc_copy_back"`
64-
UboIdDocName string `json:"ubo_id_doc_name"`
65-
UboIdDocNumber string `json:"ubo_id_doc_number"`
66-
UboIdDocType string `json:"ubo_id_doc_type"`
67-
UboPeriodBegin string `json:"ubo_period_begin"`
68-
UboPeriodEnd string `json:"ubo_period_end"`
69-
} `json:"ubo_info_list"`
70-
} `json:"subject_info"`
61+
UboIdDocAddress string `json:"ubo_id_doc_address,omitempty"`
62+
UboIdDocCopy string `json:"ubo_id_doc_copy,omitempty"`
63+
UboIdDocCopyBack string `json:"ubo_id_doc_copy_back,omitempty"`
64+
UboIdDocName string `json:"ubo_id_doc_name,omitempty"`
65+
UboIdDocNumber string `json:"ubo_id_doc_number,omitempty"`
66+
UboIdDocType string `json:"ubo_id_doc_type,omitempty"`
67+
UboPeriodBegin string `json:"ubo_period_begin,omitempty"`
68+
UboPeriodEnd string `json:"ubo_period_end,omitempty"`
69+
} `json:"ubo_info_list,omitempty"`
70+
} `json:"subject_info,omitempty"`
7171
BusinessInfo struct {
72-
MerchantShortname string `json:"merchant_shortname"`
72+
MerchantShortname string `json:"merchant_shortname,omitempty"`
7373
SalesInfo struct {
74-
AppInfo struct {
75-
AppAppid string `json:"app_appid"`
76-
AppPics []string `json:"app_pics"`
77-
} `json:"app_info"`
78-
BizStoreInfo struct {
79-
BizAddressCode string `json:"biz_address_code"`
80-
BizStoreAddress string `json:"biz_store_address"`
81-
BizStoreName string `json:"biz_store_name"`
82-
BizSubAppid string `json:"biz_sub_appid"`
83-
IndoorPic []string `json:"indoor_pic"`
84-
StoreEntrancePic []string `json:"store_entrance_pic"`
85-
} `json:"biz_store_info"`
74+
AppInfo *struct {
75+
AppAppid string `json:"app_appid,omitempty"`
76+
AppPics []string `json:"app_pics,omitempty"`
77+
} `json:"app_info,omitempty"`
78+
BizStoreInfo *struct {
79+
BizAddressCode string `json:"biz_address_code,omitempty"`
80+
BizStoreAddress string `json:"biz_store_address,omitempty"`
81+
BizStoreName string `json:"biz_store_name,omitempty"`
82+
BizSubAppid string `json:"biz_sub_appid,omitempty"`
83+
IndoorPic []string `json:"indoor_pic,omitempty"`
84+
StoreEntrancePic []string `json:"store_entrance_pic,omitempty"`
85+
} `json:"biz_store_info,omitempty"`
8686
MiniProgramInfo struct {
87-
MiniProgramAppid string `json:"mini_program_appid"`
88-
MiniProgramSubAppid string `json:"mini_program_sub_appid"`
89-
MiniProgramPics []string `json:"mini_program_pics"`
90-
} `json:"mini_program_info"`
91-
MpInfo struct {
92-
MpAppid string `json:"mp_appid"`
93-
MpPics []string `json:"mp_pics"`
94-
} `json:"mp_info"`
95-
SalesScenesType []string `json:"sales_scenes_type"`
96-
WebInfo struct {
97-
Domain string `json:"domain"`
98-
WebAppid string `json:"web_appid"`
99-
WebAuthorisation string `json:"web_authorisation"`
100-
} `json:"web_info"`
101-
WeworkInfo struct {
102-
CorpId string `json:"corp_id"`
103-
SubCorpId string `json:"sub_corp_id"`
104-
WeworkPics []string `json:"wework_pics"`
105-
} `json:"wework_info"`
106-
} `json:"sales_info"`
107-
ServicePhone string `json:"service_phone"`
108-
} `json:"business_info"`
87+
MiniProgramAppid string `json:"mini_program_appid,omitempty"`
88+
MiniProgramSubAppid string `json:"mini_program_sub_appid,omitempty"`
89+
MiniProgramPics []string `json:"mini_program_pics,omitempty"`
90+
} `json:"mini_program_info,omitempty"`
91+
MpInfo *struct {
92+
MpAppid string `json:"mp_appid,omitempty"`
93+
MpPics []string `json:"mp_pics,omitempty"`
94+
} `json:"mp_info,omitempty"`
95+
SalesScenesType []string `json:"sales_scenes_type,omitempty"`
96+
WebInfo *struct {
97+
Domain string `json:"domain,omitempty"`
98+
WebAppid string `json:"web_appid,omitempty"`
99+
WebAuthorisation string `json:"web_authorisation,omitempty"`
100+
} `json:"web_info,omitempty"`
101+
WeworkInfo *struct {
102+
CorpId string `json:"corp_id,omitempty"`
103+
SubCorpId string `json:"sub_corp_id,omitempty"`
104+
WeworkPics []string `json:"wework_pics,omitempty"`
105+
} `json:"wework_info,omitempty"`
106+
} `json:"sales_info,omitempty"`
107+
ServicePhone string `json:"service_phone,omitempty"`
108+
} `json:"business_info,omitempty"`
109109
SettlementInfo struct {
110-
ActivitiesAdditions []string `json:"activities_additions"`
111-
ActivitiesId string `json:"activities_id"`
112-
ActivitiesRate string `json:"activities_rate"`
113-
QualificationType string `json:"qualification_type"`
114-
Qualifications []string `json:"qualifications"`
115-
SettlementId string `json:"settlement_id"`
116-
} `json:"settlement_info"`
110+
ActivitiesAdditions []string `json:"activities_additions,omitempty"`
111+
ActivitiesId string `json:"activities_id,omitempty"`
112+
ActivitiesRate string `json:"activities_rate,omitempty"`
113+
QualificationType string `json:"qualification_type,omitempty"`
114+
Qualifications *[]string `json:"qualifications,omitempty"`
115+
SettlementId string `json:"settlement_id,omitempty"`
116+
} `json:"settlement_info,omitempty"`
117117
BankAccountInfo struct {
118-
AccountBank string `json:"account_bank"`
119-
AccountName string `json:"account_name"`
120-
AccountNumber string `json:"account_number"`
121-
BankAccountType string `json:"bank_account_type"`
122-
BankAddressCode string `json:"bank_address_code"`
123-
BankBranchId string `json:"bank_branch_id"`
124-
} `json:"bank_account_info"`
118+
AccountBank string `json:"account_bank,omitempty"`
119+
AccountName string `json:"account_name,omitempty"`
120+
AccountNumber string `json:"account_number,omitempty"`
121+
BankAccountType string `json:"bank_account_type,omitempty"`
122+
BankAddressCode string `json:"bank_address_code,omitempty"`
123+
BankBranchId string `json:"bank_branch_id,omitempty"`
124+
} `json:"bank_account_info,omitempty"`
125125
AdditionInfo struct {
126-
LegalPersonCommitment string `json:"legal_person_commitment"`
127-
LegalPersonVideo string `json:"legal_person_video"`
128-
BusinessAdditionPics []string `json:"business_addition_pics"`
129-
BusinessAdditionMsg string `json:"business_addition_msg"`
130-
} `json:"addition_info"`
126+
LegalPersonCommitment string `json:"legal_person_commitment,omitempty"`
127+
LegalPersonVideo string `json:"legal_person_video,omitempty"`
128+
BusinessAdditionPics []string `json:"business_addition_pics,omitempty"`
129+
BusinessAdditionMsg string `json:"business_addition_msg,omitempty"`
130+
} `json:"addition_info,omitempty"`
131131
}

0 commit comments

Comments
 (0)