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
9b77a034
Commit
9b77a034
authored
Apr 08, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.21-优化
parent
f6d55681
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
14 deletions
+21
-14
EkpBankPayTask.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
+2
-2
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+1
-1
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+11
-4
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+7
-7
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
View file @
9b77a034
...
...
@@ -202,7 +202,7 @@ public class EkpBankPayTask {
@Schema
(
description
=
"发放失败处理状态:待发放、发放中、已处理、转手工"
)
private
String
fdFailHandleStatus
;
/**
* 附件ID
* 附件ID
(存储refNo,用来回传)
*/
@ExcelAttribute
(
name
=
"附件ID"
,
maxLength
=
36
)
@Length
(
max
=
36
,
message
=
"附件ID不能超过36个字符"
)
...
...
@@ -210,7 +210,7 @@ public class EkpBankPayTask {
@Schema
(
description
=
"附件ID"
)
private
String
fdAttaId
;
/**
* 附件名称
* 附件名称
(四大报销用区分类型,后续招投标也是)
*/
@ExcelAttribute
(
name
=
"附件名称"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"附件名称不能超过200个字符"
)
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
9b77a034
...
...
@@ -59,7 +59,7 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
// 工行非税支付
// type 0 对公; 1 对私.
R
<
String
>
submitIcbcToNoTax
(
String
title
,
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
);
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
,
String
refNo
);
R
submitSearch
();
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
9b77a034
...
...
@@ -962,14 +962,17 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
main
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
String
.
valueOf
(
count
);
String
wxNo
=
main
.
getFdWxNo
();
String
refNo
=
main
.
getFdAttaId
();
// 为空或者失败数=-1,则生成新的wxNo
if
(
Common
.
isEmpty
(
wxNo
)
||
(
Common
.
isNotNull
(
main
.
getFdFailNum
())
&&
main
.
getFdFailNum
()
==
CommonConstants
.
ONE_INT_NEGATE
))
{
wxNo
=
wxNoPre
+
new
Date
().
getTime
();
refNo
=
String
.
valueOf
(
new
Date
().
getTime
());
wxNo
=
wxNoPre
+
refNo
;
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
if
(
Common
.
isNotNull
(
cur
))
{
wxNo
=
wxNoPre
+
new
Date
().
getTime
();
}
main
.
setFdAttaId
(
refNo
);
main
.
setFdWxNo
(
wxNo
);
main
.
setFdFailNum
(
CommonConstants
.
ZERO_INT
);
// 更新wxno
...
...
@@ -988,7 +991,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
packageName
=
main
.
getFdSettlementNo
()
+
CommonConstants
.
DOWN_LINE_STRING
;
}
packageName
+=
DateUtil
.
getThisTime
();
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
title
,
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
title
,
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
,
refNo
);
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
String
serialNo
=
returnR
.
getData
();
// 存储日志
...
...
@@ -1044,16 +1047,20 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
}
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
detail
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
"1"
;
String
refNo
=
detail
.
getFdAttaId
();
String
wxNo
=
detail
.
getFdWxNo
();
// 为空,或失败再次发放,生成新的wxNo
if
(
Common
.
isEmpty
(
wxNo
)
||
(
Common
.
isNotNull
(
detail
.
getFdFailNum
())
&&
detail
.
getFdFailNum
()
>
CommonConstants
.
ZERO_INT
&&
Common
.
isNotNull
(
detail
.
getFdGrantNum
())
&&
detail
.
getFdFailNum
()
>=
detail
.
getFdGrantNum
()))
{
wxNo
=
wxNoPre
+
new
Date
().
getTime
();
refNo
=
String
.
valueOf
(
new
Date
().
getTime
());
wxNo
=
wxNoPre
+
refNo
;
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
if
(
Common
.
isNotNull
(
cur
))
{
wxNo
=
wxNoPre
+
new
Date
().
getTime
();
}
refNo
+=
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getFdSerialNumber
();
detail
.
setFdAttaId
(
refNo
);
detail
.
setFdWxNo
(
wxNo
);
ekpBankGrantDetailService
.
updateById
(
detail
);
}
...
...
@@ -1072,7 +1079,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
noTaxPayType
=
CommonConstants
.
ONE_INT
;
}
List
<
EkpBankExcelNoTaxVo
>
detailList
=
ekpBankGrantDetailService
.
getEkpBankExcelVoByIdAndDetailNoTax
(
fdId
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
title
,
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
title
,
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
,
packageName
,
refNo
);
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 @
9b77a034
...
...
@@ -848,7 +848,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 改造自上面的demo接口:executePayment
// type 0 对公; 1 对私.
public
R
<
String
>
submitIcbcToNoTax
(
String
title
,
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
)
{
,
List
<
EkpBankExcelNoTaxVo
>
detailList
,
int
type
,
String
fdId
,
String
packageName
,
String
refNo
)
{
// 获取当前时间
LocalTime
currentTime
=
LocalTime
.
now
();
// 使用DateTimeFormatter格式化
...
...
@@ -890,9 +890,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
for
(
EkpBankExcelNoTaxVo
detail
:
detailList
)
{
// 0 对公
if
(
CommonConstants
.
ZERO_INT
==
type
)
{
rdDetail
=
buildPayRecordDuiGong
(
detail
,
wx
No
);
rdDetail
=
buildPayRecordDuiGong
(
detail
,
ref
No
);
}
else
{
rdDetail
=
buildPayRecordDuiSi
(
detail
,
wx
No
);
rdDetail
=
buildPayRecordDuiSi
(
detail
,
ref
No
);
}
rd
.
add
(
rdDetail
);
}
...
...
@@ -1115,7 +1115,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
// 对公
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiGong
(
EkpBankExcelNoTaxVo
detail
,
String
wx
No
)
{
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiGong
(
EkpBankExcelNoTaxVo
detail
,
String
ref
No
)
{
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
payRecord
=
new
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
();
...
...
@@ -1125,7 +1125,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
//业务唯一编号:相同指令不重复
payRecord
.
setUniBusiId
(
fdId
);
payRecord
.
setRefNo
(
wxNo
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getFdSerialNumber
()
);
payRecord
.
setRefNo
(
refNo
);
//指令顺序号:每笔指令的序号,本包内不重复
payRecord
.
setiSeqNo
(
detail
.
getFdSerialNumber
());
//预约日期
...
...
@@ -1209,7 +1209,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
return
payRecord
;
}
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiSi
(
EkpBankExcelNoTaxVo
detail
,
String
wx
No
)
{
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiSi
(
EkpBankExcelNoTaxVo
detail
,
String
ref
No
)
{
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
payRecord
=
new
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
();
String
fdId
=
detail
.
getFdId
();
...
...
@@ -1218,7 +1218,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
//业务唯一编号:相同指令不重复
payRecord
.
setUniBusiId
(
fdId
);
payRecord
.
setRefNo
(
wxNo
+
CommonConstants
.
DOWN_LINE_STRING
+
detail
.
getFdSerialNumber
()
);
payRecord
.
setRefNo
(
refNo
);
//指令顺序号:每笔指令的序号,本包内不重复
payRecord
.
setiSeqNo
(
detail
.
getFdSerialNumber
());
//预约日期
...
...
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