Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
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
68c9bc03
Commit
68c9bc03
authored
Mar 05, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
d7425f90
3687fb1f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+1
-1
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+17
-2
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+2
-2
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
68c9bc03
...
...
@@ -61,7 +61,7 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
// 工行非税支付
// type 0 对公; 1 对私.
R
<
String
>
submitIcbcToNoTax
(
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
);
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
);
R
submitSearch
();
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
68c9bc03
...
...
@@ -918,6 +918,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
redisUtil
.
set
(
redisKey
,
600L
);
}
try
{
String
packageName
;
// 获取配置的行号
Map
<
String
,
EkpBankCodeConfiglVo
>
bankMap
=
ekpBankGrantDetailService
.
getEkpBankCodeConfiglVo
();
// 1主表
...
...
@@ -960,7 +961,12 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
if
(
Common
.
isNotNull
(
main
.
getFdDownloadNum
())
&&
11
==
main
.
getFdDownloadNum
())
{
noTaxPayType
=
CommonConstants
.
ONE_INT
;
}
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
);
packageName
=
""
;
if
(
Common
.
isNotNull
(
main
.
getFdSettlementNo
()))
{
packageName
=
main
.
getFdSettlementNo
()
+
CommonConstants
.
DOWN_LINE_STRING
;
}
packageName
+=
DateUtil
.
getThisTime
();
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
);
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
String
serialNo
=
returnR
.
getData
();
// 存储日志
...
...
@@ -1009,13 +1015,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detail
.
setFdWxNo
(
wxNo
);
ekpBankGrantDetailService
.
updateById
(
detail
);
}
packageName
=
""
;
if
(
Common
.
isNotNull
(
detail
.
getFdParentId
()))
{
EkpBankPayTask
main
=
ekpBankPayTaskService
.
getById
(
detail
.
getFdParentId
());
if
(
main
!=
null
&&
Common
.
isNotNull
(
main
.
getFdSettlementNo
()))
{
packageName
=
main
.
getFdSettlementNo
()
+
CommonConstants
.
DOWN_LINE_STRING
;
}
}
packageName
+=
DateUtil
.
getThisTime
();
// 0对公1对私
int
noTaxPayType
=
CommonConstants
.
ZERO_INT
;
if
(
Common
.
isNotNull
(
detail
.
getFdDownloadNum
())
&&
11
==
detail
.
getFdDownloadNum
())
{
noTaxPayType
=
CommonConstants
.
ONE_INT
;
}
List
<
EkpBankExcelNoTaxVo
>
detailList
=
ekpBankGrantDetailService
.
getEkpBankExcelVoByIdAndDetailNoTax
(
fdId
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
);
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
String
serialNo
=
returnR
.
getData
();
// 存储日志
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
68c9bc03
...
...
@@ -844,7 +844,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 改造自上面的demo接口:executePayment
// type 0 对公; 1 对私.
public
R
<
String
>
submitIcbcToNoTax
(
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
)
{
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
)
{
// 获取当前时间
LocalTime
currentTime
=
LocalTime
.
now
();
// 使用DateTimeFormatter格式化
...
...
@@ -879,7 +879,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//报文压缩内容:zip算法压缩rd区后再BASE64编码,约定取第一个文件
bizContent
.
setZip
(
""
);
//批量包名称,使用非扣税单号
bizContent
.
setPackageName
(
wxNo
);
bizContent
.
setPackageName
(
packageName
);
List
<
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
>
rd
=
new
ArrayList
<>();
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
rdDetail
;
...
...
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