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
23b97fb4
Commit
23b97fb4
authored
Nov 27, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.2' into MVP1.7.2
parents
db1ab3dd
d51efc84
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
394 additions
and
76 deletions
+394
-76
EkpBankGrantDetail.java
...com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantDetail.java
+6
-0
EkpBankGrantLog.java
...va/com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantLog.java
+9
-13
EkpBankGrantLogDetail.java
.../yifu/cloud/plus/v1/ekp/entity/EkpBankGrantLogDetail.java
+2
-1
EkpBankResultVo.java
...n/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
+14
-0
EkpBankGrantDetailMapper.java
...fu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
+10
-0
EkpBankGrantDetailService.java
.../cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
+9
-0
EkpBankGrantDetailServiceImpl.java
...us/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
+24
-0
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+232
-41
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+66
-1
EkpBankGrantLogMapper.xml
...p-biz/src/main/resources/mapper/EkpBankGrantLogMapper.xml
+16
-18
EkpBankPayTaskMapper.xml
...kp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
+6
-2
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantDetail.java
View file @
23b97fb4
...
...
@@ -221,4 +221,10 @@ public class EkpBankGrantDetail {
@Schema
(
description
=
"MD码"
)
private
String
fdMdCode
;
@ExcelAttribute
(
name
=
"工资明细ID"
,
maxLength
=
36
)
@Length
(
max
=
36
,
message
=
"工资明细ID不能超过36个字符"
)
@ExcelProperty
(
"工资明细ID"
)
@Schema
(
description
=
"工资明细ID,用来同步中信银行状态"
)
private
String
fdSalaryId
;
}
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantLog.java
View file @
23b97fb4
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.ekp.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -27,7 +28,10 @@ import lombok.Data;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
/**
* 发放日志(银企付款任务)
...
...
@@ -64,14 +68,6 @@ public class EkpBankGrantLog {
@ExcelProperty
(
"代发批次号"
)
@Schema
(
description
=
"代发批次号"
)
private
String
fdBatchNumber
;
/**
* 代发批次号ID:跳转使用
*/
@ExcelAttribute
(
name
=
"代发批次号ID:跳转使用"
,
maxLength
=
36
)
@Length
(
max
=
36
,
message
=
"代发批次号ID:跳转使用不能超过36个字符"
)
@ExcelProperty
(
"代发批次号ID:跳转使用"
)
@Schema
(
description
=
"代发批次号ID:跳转使用"
)
private
String
fdBatchNumberId
;
/**
* 批量包名称
*/
...
...
@@ -125,28 +121,28 @@ public class EkpBankGrantLog {
@ExcelAttribute
(
name
=
"交易时间"
,
isDate
=
true
)
@ExcelProperty
(
"交易时间"
)
@Schema
(
description
=
"交易时间"
)
private
LocalDateTim
e
fdTransactionTime
;
private
Dat
e
fdTransactionTime
;
/**
* 成功总金额
*/
@ExcelAttribute
(
name
=
"成功总金额"
)
@ExcelProperty
(
"成功总金额"
)
@Schema
(
description
=
"成功总金额"
)
private
Double
fdSuccessFee
;
private
BigDecimal
fdSuccessFee
;
/**
* 失败总金额
*/
@ExcelAttribute
(
name
=
"失败总金额"
)
@ExcelProperty
(
"失败总金额"
)
@Schema
(
description
=
"失败总金额"
)
private
Double
fdFailFee
;
private
BigDecimal
fdFailFee
;
/**
* 总金额
*/
@ExcelAttribute
(
name
=
"总金额"
)
@ExcelProperty
(
"总金额"
)
@Schema
(
description
=
"总金额"
)
private
Double
fdSumFee
;
private
BigDecimal
fdSumFee
;
/**
* 总笔数
*/
...
...
@@ -167,6 +163,6 @@ public class EkpBankGrantLog {
@ExcelAttribute
(
name
=
"失败总笔数"
)
@ExcelProperty
(
"失败总笔数"
)
@Schema
(
description
=
"失败总笔数"
)
private
Integer
fdTransactionFailToal
;
private
Integer
fdTransactionFailTo
t
al
;
}
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantLogDetail.java
View file @
23b97fb4
...
...
@@ -27,6 +27,7 @@ import lombok.Data;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
/**
* 发放日志明细(银企付款任务)
...
...
@@ -77,7 +78,7 @@ public class EkpBankGrantLogDetail {
@ExcelAttribute
(
name
=
"金额"
)
@ExcelProperty
(
"金额"
)
@Schema
(
description
=
"金额"
)
private
Double
fdMoney
;
private
BigDecimal
fdMoney
;
/**
* 收款银行
*/
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
View file @
23b97fb4
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -16,5 +17,18 @@ public class EkpBankResultVo implements Serializable {
private
String
fdId
;
private
String
fdParentId
;
private
String
fdWxNo
;
private
String
fdSalaryId
;
@Schema
(
description
=
"付款银行名称"
)
private
String
fdBankName
;
@Schema
(
description
=
"付款银行开户行"
)
private
String
fdBankNo
;
@Schema
(
description
=
"付款银行账户"
)
private
String
fdBankAccount
;
@Schema
(
description
=
"收款人名称"
)
private
String
fdPayeeName
;
private
Integer
fdGrantNum
;
private
Integer
fdFailNum
;
private
Integer
num
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
View file @
23b97fb4
...
...
@@ -51,6 +51,16 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
// 主表拒绝授权时,批量更新明细表为发放失败,原因为拒绝授权
void
updateStatusByGrantFail
(
@Param
(
"fdParentId"
)
String
fdParentId
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatus
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinMainStatus
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatusAndBankInfo
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
// 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinMainStatusAndBankInfo
(
@Param
(
"salaryIdList"
)
List
<
String
>
salaryIdList
);
// 获取明细表ID来更新状态
List
<
EkpBankGrantDetail
>
getListByParentId
(
@Param
(
"fdParentId"
)
String
fdParentId
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
View file @
23b97fb4
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -46,6 +47,14 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
// 主表发放时,更新明细表的发放时间与状态
void
updateStatusByGrant
(
String
fdParentId
);
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatus
(
List
<
String
>
salaryIdList
);
void
updateZhongXinMainStatus
(
List
<
String
>
salaryIdList
);
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
void
updateZhongXinStatusAndBankInfo
(
List
<
String
>
salaryIdList
);
void
updateZhongXinMainStatusAndBankInfo
(
List
<
String
>
salaryIdList
);
// 主表拒绝授权时,批量更新明细表为发放失败,原因为拒绝授权
void
updateStatusByGrantFail
(
String
fdParentId
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
View file @
23b97fb4
...
...
@@ -62,6 +62,30 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
baseMapper
.
updateStatusByGrant
(
fdParentId
);
}
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
public
void
updateZhongXinStatus
(
List
<
String
>
salaryIdList
)
{
baseMapper
.
updateZhongXinStatus
(
salaryIdList
);
}
// 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
public
void
updateZhongXinMainStatus
(
List
<
String
>
salaryIdList
)
{
baseMapper
.
updateZhongXinMainStatus
(
salaryIdList
);
}
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
public
void
updateZhongXinStatusAndBankInfo
(
List
<
String
>
salaryIdList
)
{
baseMapper
.
updateZhongXinStatusAndBankInfo
(
salaryIdList
);
}
// 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde
@Override
public
void
updateZhongXinMainStatusAndBankInfo
(
List
<
String
>
salaryIdList
)
{
baseMapper
.
updateZhongXinMainStatusAndBankInfo
(
salaryIdList
);
}
@Override
public
void
updateStatusByGrantFail
(
String
fdParentId
)
{
baseMapper
.
updateStatusByGrantFail
(
fdParentId
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
23b97fb4
This diff is collapsed.
Click to expand it.
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
23b97fb4
...
...
@@ -49,6 +49,7 @@
<result
property=
"fdEmpPhone"
column=
"fd_emp_phone"
/>
<result
property=
"fdWxNo"
column=
"fd_wx_no"
/>
<result
property=
"fdMdCode"
column=
"fd_md_dcode"
/>
<result
property=
"fdSalaryId"
column=
"fd_salary_id"
/>
</resultMap>
<sql
id=
"Base_Excel_Sql"
>
...
...
@@ -118,8 +119,72 @@
<select
id=
"getListByParentId"
resultMap=
"ekpBankGrantDetailMap"
>
select
a.fd_id,
fd_serial_number
a.fd_id,
a.fd_salary_id,a.fd_serial_number,a.fd_payee_name
from ekp_bank_grant_detail a where a.fd_parent_id = #{fdParentId}
</select>
<!-- 发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinStatus"
>
update ekp_db4ed54e25543f4b7a9a a
set a.fd_3b148bc0c28e48='失败',a.fd_3c754f2a7125a0 = '1183b0b84ee4f581bba001c47a78b2d9',fd_3c754a976ddde2=now()
where
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
a.fd_3b1fe00b0f5dde in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
<!-- 发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinMainStatus"
>
UPDATE modeling_simple_main a
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_3c754f2a7125a0', '1183b0b84ee4f581bba001c47a78b2d9','$[1].fd_3c754a976ddde2', now())
where
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
b.fd_3b56782982b8b2 in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
<!-- 明细再次-发放失败,批量更新中信银行交易流水表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinStatusAndBankInfo"
>
update ekp_db4ed54e25543f4b7a9a a
left join ekp_bank_grant_detail d on a.fd_3b1fe00b0f5dde=d.fd_salary_id
set a.fd_3b148bc0c28e48='失败',a.fd_3c754f2a7125a0 = '1183b0b84ee4f581bba001c47a78b2d9',a.fd_3c754a976ddde2=now(),
a.fd_3afd45029541be=d.fd_payee_name,a.fd_3afd4500f91ae6=d.fd_payee_account,a.fd_3afd4502e34bc0=d.fd_recipient_bank
where
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
a.fd_3b1fe00b0f5dde in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
<!-- 明细再次-发放失败,批量更新中信银行交易流水Model表fd_3b148bc0c28e48为失败,根据 工资明细fdId:fd_3b1fe00b0f5dde -->
<update
id=
"updateZhongXinMainStatusAndBankInfo"
>
UPDATE modeling_simple_main a
JOIN ekp_db4ed54e25543f4b7a9a b on a.fd_id=b.fd_id
left join ekp_bank_grant_detail d on b.fd_3b1fe00b0f5dde=d.fd_salary_id
SET a.extend_data_xml=JSON_SET(a.extend_data_xml,'$[1].fd_3b148bc0c28e48', '失败'
, '$[1].fd_3c754f2a7125a0', '1183b0b84ee4f581bba001c47a78b2d9'
,'$[1].fd_3c754a976ddde2', now()
,'$[1].fd_3afd45029541be', d.fd_payee_name
,'$[1].fd_3afd4500f91ae6', d.fd_payee_account
,'$[1].fd_3afd4502e34bc0', d.fd_recipient_bank
)
where
<if
test=
"salaryIdList != null and salaryIdList.size() > 0"
>
b.fd_3b56782982b8b2 in
<foreach
collection=
"salaryIdList"
item=
"item"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
</update>
</mapper>
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantLogMapper.xml
View file @
23b97fb4
...
...
@@ -26,7 +26,6 @@
<resultMap
id=
"ekpBankGrantLogMap"
type=
"com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantLog"
>
<id
property=
"fdId"
column=
"fd_id"
/>
<result
property=
"fdBatchNumber"
column=
"fd_batch_number"
/>
<result
property=
"fdBatchNumberId"
column=
"fd_batch_number_id"
/>
<result
property=
"fdBatchPackage"
column=
"fd_batch_package"
/>
<result
property=
"fdPaymentAccount"
column=
"fd_payment_account"
/>
<result
property=
"fdDrawee"
column=
"fd_drawee"
/>
...
...
@@ -39,25 +38,24 @@
<result
property=
"fdSumFee"
column=
"fd_sum_fee"
/>
<result
property=
"fdTransactionTotal"
column=
"fd_transaction_total"
/>
<result
property=
"fdTransactionSuccessTotal"
column=
"fd_transaction_success_total"
/>
<result
property=
"fdTransactionFailTo
al"
column=
"fd_transaction_fail_to
al"
/>
<result
property=
"fdTransactionFailTo
tal"
column=
"fd_transaction_fail_tot
al"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.fd_id,
a.fd_batch_number,
a.fd_batch_number_id,
a.fd_batch_package,
a.fd_payment_account,
a.fd_drawee,
a.fd_currency,
a.fd_business_type,
a.fd_submit_time,
a.fd_transaction_time,
a.fd_success_fee,
a.fd_fail_fee,
a.fd_sum_fee,
a.fd_transaction_total,
a.fd_transaction_success_total,
a.fd_transaction_fail_toal
a.fd_id,
a.fd_batch_number,
a.fd_batch_package,
a.fd_payment_account,
a.fd_drawee,
a.fd_currency,
a.fd_business_type,
a.fd_submit_time,
a.fd_transaction_time,
a.fd_success_fee,
a.fd_fail_fee,
a.fd_sum_fee,
a.fd_transaction_total,
a.fd_transaction_success_total,
a.fd_transaction_fail_total
</sql>
</mapper>
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
View file @
23b97fb4
...
...
@@ -87,7 +87,9 @@
<!-- 获取发放中的主表,查询结果 -->
<select
id=
"getEkpBankMainByNeedResultMain"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"
>
select a.fd_id fdId,a.fd_wx_no fdWxNo,count(d.fd_id) num
select a.fd_id fdId,a.fd_wx_no fdWxNo
,count(d.fd_id) num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount
,a.fd_grant_num fdGrantNum
from ekp_bank_pay_task a left join ekp_bank_grant_detail d on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '发放中'
GROUP BY a.fd_id
...
...
@@ -95,7 +97,9 @@
<!-- 获取发放中的明细表,查询结果 -->
<select
id=
"getEkpBankMainByNeedResultDetail"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo"
>
select d.fd_id fdId,d.fd_wx_no fdWxNo,d.fd_parent_id fdParentId,'1' num
select d.fd_id fdId,d.fd_wx_no fdWxNo,d.fd_parent_id fdParentId,d.fd_fail_num fdFailNum,d.fd_salary_id fdSalaryId
,'1' num,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount,d.fd_payee_name fdPayeeName
,d.fd_grant_num fdGrantNum
from ekp_bank_grant_detail d left join ekp_bank_pay_task a on a.fd_id = d.fd_parent_id
where a.fd_grant_status = '已发放' and d.fd_grant_status = '发放失败' and d.fd_handle_status = '发放中'
</select>
...
...
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