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
3399803f
Commit
3399803f
authored
Nov 29, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.2 顺序
parent
914cf429
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
42 deletions
+20
-42
DateUtil.java
...om/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
+1
-3
EkpBankGrantDetailMapper.java
...fu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
+2
-2
EkpBankGrantDetailService.java
.../cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
+2
-2
EkpBankGrantDetailServiceImpl.java
...us/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
+4
-4
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+5
-15
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+6
-16
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
View file @
3399803f
...
@@ -312,9 +312,7 @@ public class DateUtil {
...
@@ -312,9 +312,7 @@ public class DateUtil {
}
}
DateFormat
df
=
new
SimpleDateFormat
(
format
);
DateFormat
df
=
new
SimpleDateFormat
(
format
);
df
.
setLenient
(
false
);
df
.
setLenient
(
false
);
return
df
.
parse
(
dateText
.
replace
(
"/"
,
""
).
replace
(
"-"
,
""
)
return
df
.
parse
(
dateText
);
.
replace
(
CommonConstants
.
YEAR
,
""
).
replace
(
CommonConstants
.
MONTH
,
""
)
.
replace
(
CommonConstants
.
DAY
,
""
));
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
return
null
;
return
null
;
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
View file @
3399803f
...
@@ -52,9 +52,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
...
@@ -52,9 +52,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
void
updateStatusByGrantFail
(
@Param
(
"fdParentId"
)
String
fdParentId
);
void
updateStatusByGrantFail
(
@Param
(
"fdParentId"
)
String
fdParentId
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatus
(
@Param
(
"salaryId
List"
)
List
<
String
>
salaryIdList
);
void
updateZhongXinStatus
(
@Param
(
"salaryId
"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
);
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinMainStatus
(
@Param
(
"salaryId
List"
)
List
<
String
>
salaryIdList
);
void
updateZhongXinMainStatus
(
@Param
(
"salaryId
"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatusAndBankInfo
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
void
updateZhongXinStatusAndBankInfo
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
View file @
3399803f
...
@@ -48,8 +48,8 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
...
@@ -48,8 +48,8 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
void
updateStatusByGrant
(
String
fdParentId
);
void
updateStatusByGrant
(
String
fdParentId
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatus
(
List
<
String
>
salaryIdList
);
void
updateZhongXinStatus
(
String
salaryId
,
String
detailId
);
void
updateZhongXinMainStatus
(
List
<
String
>
salaryIdList
);
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
);
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatusAndBankInfo
(
List
<
String
>
salaryIdList
);
void
updateZhongXinStatusAndBankInfo
(
List
<
String
>
salaryIdList
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
View file @
3399803f
...
@@ -64,14 +64,14 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
...
@@ -64,14 +64,14 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
@Override
public
void
updateZhongXinStatus
(
List
<
String
>
salaryIdList
)
{
public
void
updateZhongXinStatus
(
String
salaryId
,
String
detailId
)
{
baseMapper
.
updateZhongXinStatus
(
salaryId
List
);
baseMapper
.
updateZhongXinStatus
(
salaryId
,
detailId
);
}
}
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
@Override
public
void
updateZhongXinMainStatus
(
List
<
String
>
salaryIdList
)
{
public
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
)
{
baseMapper
.
updateZhongXinMainStatus
(
salaryId
List
);
baseMapper
.
updateZhongXinMainStatus
(
salaryId
,
detailId
);
}
}
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
3399803f
...
@@ -803,7 +803,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -803,7 +803,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
EkpBankGrantDetail
detailData
;
EkpBankGrantDetail
detailData
;
EkpBankPayTask
main
;
EkpBankPayTask
main
;
List
<
EkpBankGrantDetail
>
oldDetailList
;
List
<
EkpBankGrantDetail
>
oldDetailList
;
List
<
String
>
zhongXinSalaryIdList
;
Map
<
String
,
EkpBankGrantDetail
>
oldMap
;
Map
<
String
,
EkpBankGrantDetail
>
oldMap
;
BigDecimal
moneySuccess
;
BigDecimal
moneySuccess
;
BigDecimal
moneyFail
;
BigDecimal
moneyFail
;
...
@@ -845,7 +844,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -845,7 +844,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
numFail
=
0
;
numFail
=
0
;
if
(
dataList
!=
null
&&
!
dataList
.
isEmpty
())
{
if
(
dataList
!=
null
&&
!
dataList
.
isEmpty
())
{
detailDataList
=
new
ArrayList
<>();
detailDataList
=
new
ArrayList
<>();
zhongXinSalaryIdList
=
new
ArrayList
<>();
for
(
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
data
:
dataList
)
{
for
(
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
data
:
dataList
)
{
// 交易时间
// 交易时间
...
@@ -875,7 +873,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -875,7 +873,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detailData
.
setFdHandleStatus
(
""
);
detailData
.
setFdHandleStatus
(
""
);
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
// 批量更新中信银行表数据,使发放失败处理有数据出现
// 批量更新中信银行表数据,使发放失败处理有数据出现
zhongXinSalaryIdList
.
add
(
detailData
.
getFdSalaryId
());
ekpBankGrantDetailService
.
updateZhongXinStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
());
}
}
detailDataList
.
add
(
detailData
);
detailDataList
.
add
(
detailData
);
}
}
...
@@ -889,11 +888,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -889,11 +888,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
ekpBankPayTaskService
.
updateById
(
main
);
ekpBankPayTaskService
.
updateById
(
main
);
// 更新明细状态为成功或失败
// 更新明细状态为成功或失败
ekpBankGrantDetailService
.
updateBatchById
(
detailDataList
);
ekpBankGrantDetailService
.
updateBatchById
(
detailDataList
);
// 生成发放失败待处理表数据-也可以 批量 生成
if
(!
zhongXinSalaryIdList
.
isEmpty
())
{
ekpBankGrantDetailService
.
updateZhongXinStatus
(
zhongXinSalaryIdList
);
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
zhongXinSalaryIdList
);
}
}
}
if
(
numSuccess
>
0
)
{
if
(
numSuccess
>
0
)
{
...
@@ -935,7 +930,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -935,7 +930,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
List
<
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
>
dataList
;
List
<
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
>
dataList
;
List
<
EkpBankGrantDetail
>
detailDataList
=
new
ArrayList
<>();
List
<
EkpBankGrantDetail
>
detailDataList
=
new
ArrayList
<>();
EkpBankGrantDetail
detailData
;
EkpBankGrantDetail
detailData
;
List
<
String
>
zhongXinSalaryIdList
=
new
ArrayList
<>();
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
data
;
JftApiPayrollQueryDetailResponseV1
.
JftApiPayrollDetail
data
;
List
<
EkpBankIcbcLog
>
icbcLogList
=
new
ArrayList
<>();
List
<
EkpBankIcbcLog
>
icbcLogList
=
new
ArrayList
<>();
for
(
EkpBankResultVo
vo
:
detailList
)
{
for
(
EkpBankResultVo
vo
:
detailList
)
{
...
@@ -996,7 +990,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -996,7 +990,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
detailData
.
setFdFailNum
(
vo
.
getFdFailNum
()
+
1
);
detailData
.
setFdFailNum
(
vo
.
getFdFailNum
()
+
1
);
// 批量更新中信银行表数据,使发放失败处理有数据出现
// 批量更新中信银行表数据,使发放失败处理有数据出现
zhongXinSalaryIdList
.
add
(
vo
.
getFdSalaryId
());
ekpBankGrantDetailService
.
updateZhongXinStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
());
}
}
ekpBankGrantLogService
.
updateById
(
logs
);
ekpBankGrantLogService
.
updateById
(
logs
);
detailDataList
.
add
(
detailData
);
detailDataList
.
add
(
detailData
);
...
@@ -1005,11 +1000,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -1005,11 +1000,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
}
}
// 更新明细状态为成功或失败
// 更新明细状态为成功或失败
ekpBankGrantDetailService
.
updateBatchById
(
detailDataList
);
ekpBankGrantDetailService
.
updateBatchById
(
detailDataList
);
// 生成发放失败待处理表数据-也可以 批量 生成
if
(!
zhongXinSalaryIdList
.
isEmpty
())
{
ekpBankGrantDetailService
.
updateZhongXinStatusAndBankInfo
(
zhongXinSalaryIdList
);
ekpBankGrantDetailService
.
updateZhongXinMainStatusAndBankInfo
(
zhongXinSalaryIdList
);
}
if
(!
icbcLogList
.
isEmpty
())
{
if
(!
icbcLogList
.
isEmpty
())
{
ekpBankIcbcLogService
.
saveBatch
(
icbcLogList
);
ekpBankIcbcLogService
.
saveBatch
(
icbcLogList
);
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
3399803f
...
@@ -126,28 +126,18 @@
...
@@ -126,28 +126,18 @@
<!-- 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<!-- 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinStatus"
>
<update
id=
"updateZhongXinStatus"
>
update ekp_db4ed54e25543f4b7a9a a
update ekp_db4ed54e25543f4b7a9a a
set a.fd_3b148bc0c28e48='失败'
set a.fd_3b148bc0c28e48='失败',a.fd_tbankempid = #{detailId}
where
where a.fd_3b1fe00b0f5dde = #{salaryId}
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
a.fd_3b1fe00b0f5dde in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
</update>
<!-- 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<!-- 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinMainStatus"
>
<update
id=
"updateZhongXinMainStatus"
>
UPDATE modeling_simple_main a
UPDATE modeling_simple_main a
JOIN ekp_db4ed54e25543f4b7a9a b on a.fd_id=b.fd_id
JOIN ekp_db4ed54e25543f4b7a9a b on a.fd_id=b.fd_id
SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败')
SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败','$[1].fd_tbankempid', #{detailId})
where
where b.fd_3b56782982b8b2 = #{salaryId}
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
b.fd_3b56782982b8b2 in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
</update>
...
...
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