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
d1945f88
Commit
d1945f88
authored
Dec 05, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
deb11991
48143e87
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
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
+4
-4
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+2
-2
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
View file @
d1945f88
...
@@ -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"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
);
void
updateZhongXinStatus
(
@Param
(
"salaryId"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
,
@Param
(
"detailFailMsg"
)
String
detailFailMsg
);
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinMainStatus
(
@Param
(
"salaryId"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
);
void
updateZhongXinMainStatus
(
@Param
(
"salaryId"
)
String
salaryId
,
@Param
(
"detailId"
)
String
detailId
,
@Param
(
"detailFailMsg"
)
String
detailFailMsg
);
// 发放失败,批量更新中信银行交易流水表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 @
d1945f88
...
@@ -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
(
String
salaryId
,
String
detailId
);
void
updateZhongXinStatus
(
String
salaryId
,
String
detailId
,
String
detailFailMsg
);
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
);
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
,
String
detailFailMsg
);
// 明细再次-发放失败,批量更新中信银行交易流水表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 @
d1945f88
...
@@ -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
(
String
salaryId
,
String
detailId
)
{
public
void
updateZhongXinStatus
(
String
salaryId
,
String
detailId
,
String
detailFailMsg
)
{
baseMapper
.
updateZhongXinStatus
(
salaryId
,
detailId
);
baseMapper
.
updateZhongXinStatus
(
salaryId
,
detailId
,
detailFailMsg
);
}
}
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
@Override
public
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
)
{
public
void
updateZhongXinMainStatus
(
String
salaryId
,
String
detailId
,
String
detailFailMsg
)
{
baseMapper
.
updateZhongXinMainStatus
(
salaryId
,
detailId
);
baseMapper
.
updateZhongXinMainStatus
(
salaryId
,
detailId
,
detailFailMsg
);
}
}
// 明细再次-发放失败,批量更新中信银行交易流水表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 @
d1945f88
...
@@ -877,8 +877,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -877,8 +877,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
detailData
.
setFdFailureFeedback
(
data
.
getCompanyHandlerResult
());
detailData
.
setFdFailNum
(
detailData
.
getFdFailNum
()
+
1
);
detailData
.
setFdFailNum
(
detailData
.
getFdFailNum
()
+
1
);
// 批量更新中信银行表数据,使发放失败处理有数据出现
// 批量更新中信银行表数据,使发放失败处理有数据出现
ekpBankGrantDetailService
.
updateZhongXinStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
()
,
data
.
getCompanyHandlerResult
()
);
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
detailData
.
getFdSalaryId
(),
detailData
.
getFdId
()
,
data
.
getCompanyHandlerResult
()
);
}
}
detailDataList
.
add
(
detailData
);
detailDataList
.
add
(
detailData
);
}
}
...
@@ -991,8 +991,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -991,8 +991,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
);
// 批量更新中信银行表数据,使发放失败处理有数据出现
// 批量更新中信银行表数据,使发放失败处理有数据出现
ekpBankGrantDetailService
.
updateZhongXinStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
()
,
data
.
getCompanyHandlerResult
()
);
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
());
ekpBankGrantDetailService
.
updateZhongXinMainStatus
(
vo
.
getFdSalaryId
(),
vo
.
getFdId
()
,
data
.
getCompanyHandlerResult
()
);
}
}
// 交易时间
// 交易时间
if
(
Common
.
isNotNull
(
data
.
getCompanyHandleTime
()))
{
if
(
Common
.
isNotNull
(
data
.
getCompanyHandleTime
()))
{
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
d1945f88
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
<!-- 发放失败,批量更新中信银行交易流水表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='失败',a.fd_tbankempid = #{detailId}
set a.fd_3b148bc0c28e48='失败',a.fd_tbankempid = #{detailId}
,a.fd_3aff567d4b75ce = #{detailFailMsg}
where a.fd_3b1fe00b0f5dde = #{salaryId}
where a.fd_3b1fe00b0f5dde = #{salaryId}
</update>
</update>
...
@@ -135,7 +135,7 @@
...
@@ -135,7 +135,7 @@
<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', '失败','$[1].fd_tbankempid', #{detailId})
SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败','$[1].fd_tbankempid', #{detailId}
, '$[1].fd_3aff567d4b75ce', #{detailFailMsg}
)
where b.fd_3b56782982b8b2 = #{salaryId}
where b.fd_3b56782982b8b2 = #{salaryId}
</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