Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
534d9dbf
You need to sign in or sign up before continuing.
Commit
534d9dbf
authored
Sep 13, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10
parents
fbc48bfd
fc7325e9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+12
-11
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
534d9dbf
...
@@ -14,7 +14,6 @@ import com.icbc.api.response.JftApiB2bpayTransqueryResponseV1;
...
@@ -14,7 +14,6 @@ import com.icbc.api.response.JftApiB2bpayTransqueryResponseV1;
import
com.icbc.api.response.JftApiPayB2bpayGenpreorderResponseV1
;
import
com.icbc.api.response.JftApiPayB2bpayGenpreorderResponseV1
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.icbc.api.response.MybankEnterpriseTradeQhisdResponseV1
;
import
com.icbc.api.response.MybankEnterpriseTradeQhisdResponseV1
;
import
com.icbc.api.utils.IcbcSignature
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
...
@@ -118,6 +117,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -118,6 +117,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
public
R
getIcbcTransactionFlowNew
()
throws
IcbcApiException
{
public
R
getIcbcTransactionFlowNew
()
throws
IcbcApiException
{
//从9月12号开始执行定时任务
if
(
DateUtil
.
getCurrentDateString
().
compareTo
(
"2024-09-12"
)
<
0
)
{
return
R
.
ok
();
}
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
...
@@ -177,6 +180,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -177,6 +180,10 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
public
R
getIcbcTransactionFlowYesterdayInner
()
throws
IcbcApiException
{
public
R
getIcbcTransactionFlowYesterdayInner
()
throws
IcbcApiException
{
//从9月13号开始执行定时任务
if
(
DateUtil
.
getCurrentDateString
().
compareTo
(
"2024-09-13"
)
<
0
)
{
return
R
.
ok
();
}
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
...
@@ -273,12 +280,6 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -273,12 +280,6 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
}
public
R
querybankinfo
()
{
public
R
querybankinfo
()
{
String
ca_sm_path
=
"D:/icbcFile/ahwx_y_1302.cer"
;
String
ca_sm_icbc_path
=
"D:/icbcFile/API_GATEWAY_ICBC_SM_REAL.cer"
;
String
ca_sm
=
IcbcSignature
.
getCAInfoStr
(
ca_sm_path
);
String
ca_sm_icbc
=
IcbcSignature
.
getCAInfoStr
(
ca_sm_icbc_path
);
String
privateKey
=
"4d931f6ad4331158fcc4dea23f0d71393328146e40b5f63f197b9f6ad3732f44"
;
String
privateKey
=
"4d931f6ad4331158fcc4dea23f0d71393328146e40b5f63f197b9f6ad3732f44"
;
...
@@ -287,8 +288,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -287,8 +288,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// DefaultIcbcClient client = new DefaultIcbcClient("11000000000000019038", IcbcConstants.SIGN_TYPE_CA_SM_ICBC,privateKey, APIGW_PUBLIC_KEY);
// DefaultIcbcClient client = new DefaultIcbcClient("11000000000000019038", IcbcConstants.SIGN_TYPE_CA_SM_ICBC,privateKey, APIGW_PUBLIC_KEY);
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
"11000000000000019038"
,
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
privateKey
,
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
"11000000000000019038"
,
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
privateKey
,
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
ca_sm
,
null
);
null
,
null
,
icbcConfigProperties
.
getCaSm
()
,
null
);
client
.
setIcbc_ca
(
ca_sm_icbc
);
client
.
setIcbc_ca
(
icbcConfigProperties
.
getCaSmIcbc
()
);
try
{
try
{
MybankEnterpriseAccountQuerybankinfoRequestV1
.
MybankEnterpriseAccountQuerybankinfoRequestBizV1
bizContent
=
MybankEnterpriseAccountQuerybankinfoRequestV1
.
MybankEnterpriseAccountQuerybankinfoRequestBizV1
bizContent
=
new
MybankEnterpriseAccountQuerybankinfoRequestV1
.
MybankEnterpriseAccountQuerybankinfoRequestBizV1
();
new
MybankEnterpriseAccountQuerybankinfoRequestV1
.
MybankEnterpriseAccountQuerybankinfoRequestBizV1
();
...
@@ -299,7 +300,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -299,7 +300,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
bizContent
.
setTranTime
(
"103231001"
);
bizContent
.
setTranTime
(
"103231001"
);
bizContent
.
setLanguage
(
"zh_CN"
);
bizContent
.
setLanguage
(
"zh_CN"
);
bizContent
.
setfSeqNo
(
"AHWX"
+
System
.
currentTimeMillis
());
bizContent
.
setfSeqNo
(
"AHWX"
+
System
.
currentTimeMillis
());
bizContent
.
setCardNo
(
"62
22620250010165293
"
);
bizContent
.
setCardNo
(
"62
17752510002149161
"
);
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/account/querybankinfo/V1"
);
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/account/querybankinfo/V1"
);
request
.
setBizContent
(
bizContent
);
request
.
setBizContent
(
bizContent
);
MybankEnterpriseAccountQuerybankinfoResponseV1
response
=
client
.
execute
(
request
);
MybankEnterpriseAccountQuerybankinfoResponseV1
response
=
client
.
execute
(
request
);
...
@@ -433,7 +434,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -433,7 +434,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
pushParam
.
setFd_recipAccountNo
(
entry
.
getRecipAccountNo
());
pushParam
.
setFd_recipAccountNo
(
entry
.
getRecipAccountNo
());
pushParam
.
setFd_recipBkName
(
entry
.
getRecipBkName
());
pushParam
.
setFd_recipBkName
(
entry
.
getRecipBkName
());
pushParam
.
setFd_date
(
entry
.
getBusiDate
()
+
" "
+
entry
.
getBusiTime
());
pushParam
.
setFd_date
(
entry
.
getBusiDate
()
+
" "
+
entry
.
getBusiTime
()
.
replace
(
"."
,
":"
)
);
pushParam
.
setFd_receiveBkName
(
bankName
);
pushParam
.
setFd_receiveBkName
(
bankName
);
pushParam
.
setFd_receiveBkNo
(
bankNo
);
pushParam
.
setFd_receiveBkNo
(
bankNo
);
pushParam
.
setFd_remark
(
entry
.
getSummary
());
pushParam
.
setFd_remark
(
entry
.
getSummary
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment