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
40e7a586
Commit
40e7a586
authored
Feb 27, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
10bb1891
20ea9b8c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
576 additions
and
55 deletions
+576
-55
EkpBankGrantDetail.java
...com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantDetail.java
+1
-1
EkpBankIcbcLog.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankIcbcLog.java
+1
-1
EkpBankPayTask.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
+1
-1
EkpBankExcelNoTaxVo.java
...va/com/yifu/cloud/plus/v1/ekp/vo/EkpBankExcelNoTaxVo.java
+20
-0
EkpBankResultVo.java
...n/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
+5
-0
IcbcTransactionFlowIssueController.java
...v1/ekp/controller/IcbcTransactionFlowIssueController.java
+5
-2
EkpBankGrantDetailMapper.java
...fu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
+4
-0
EkpBankPayTaskMapper.java
...m/yifu/cloud/plus/v1/ekp/mapper/EkpBankPayTaskMapper.java
+3
-2
EkpBankGrantDetailService.java
.../cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
+4
-1
EkpBankPayTaskService.java
...yifu/cloud/plus/v1/ekp/service/EkpBankPayTaskService.java
+2
-2
IcbcTransactionFlowIssueService.java
.../plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
+9
-1
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+8
-1
EkpBankGrantDetailServiceImpl.java
...us/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
+10
-0
EkpBankPayTaskServiceImpl.java
...d/plus/v1/ekp/service/impl/EkpBankPayTaskServiceImpl.java
+4
-4
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+412
-22
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+41
-13
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+40
-0
EkpBankPayTaskMapper.xml
...kp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
+6
-4
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankGrantDetail.java
View file @
40e7a586
...
...
@@ -175,7 +175,7 @@ public class EkpBankGrantDetail {
@Schema
(
description
=
"附件名称"
)
private
String
fdAttaName
;
/**
* 附件资源路径
* 附件资源路径
(非扣税存储serialNo(f_seq_no),用来查询结果等)
*/
@ExcelAttribute
(
name
=
"附件资源路径"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"附件资源路径不能超过200个字符"
)
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankIcbcLog.java
View file @
40e7a586
...
...
@@ -64,7 +64,7 @@ public class EkpBankIcbcLog {
@Schema
(
description
=
"关联ID"
)
private
String
fdParentId
;
/**
* 类型
* 类型
3非扣税提交,4非扣税提交反馈 6非扣税获取结果
*/
@ExcelAttribute
(
name
=
"类型"
,
maxLength
=
1
)
@Length
(
max
=
36
,
message
=
"类型不能超过1个字符"
)
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
View file @
40e7a586
...
...
@@ -218,7 +218,7 @@ public class EkpBankPayTask {
@Schema
(
description
=
"附件名称"
)
private
String
fdAttaName
;
/**
* 附件资源路径
* 附件资源路径
(非扣税存储serialNo(f_seq_no),用来查询结果等)
*/
@ExcelAttribute
(
name
=
"附件资源路径"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"附件资源路径不能超过200个字符"
)
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankExcelNoTaxVo.java
0 → 100644
View file @
40e7a586
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hgw
* @Date 2024-11-18 10:23:18
* @Description EKP银企付款下载文件Vo
* @Version 1.0
*/
@Data
public
class
EkpBankExcelNoTaxVo
extends
EkpBankExcelVo
{
// 日期 明细标志 顺序号 报销号 单据张数 付款账号开户行 付款账号/卡号 付款账号名称/卡名称 收款账号开户行
// 收款地区 收款银行人行行号 汇款方式 收款账号 收款账号名称 金额 汇款用途 备注信息 收款账户短信通知手机号码
private
String
fdId
;
}
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpBankResultVo.java
View file @
40e7a586
...
...
@@ -33,4 +33,9 @@ public class EkpBankResultVo implements Serializable {
private
Integer
fdGrantNum
;
private
Integer
fdFailNum
;
private
Integer
num
;
// 非扣税存储serialNo(f_seq_no),用来查询结果等
private
String
fdAttaSrc
;
// 非扣税使用的金额,授权失败记录金额
private
String
fdMoney
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowIssueController.java
View file @
40e7a586
...
...
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.net.URISyntaxException
;
/**
* 聚富通代发工资相关
...
...
@@ -150,7 +149,11 @@ public class IcbcTransactionFlowIssueController {
@Inner
@PostMapping
(
"/inner/doGetEkpBankStatus"
)
public
R
<
String
>
doGetEkpBankStatus
()
{
return
icbcTransactionFlowIssueService
.
doGetEkpBankStatus
();
// 工资
icbcTransactionFlowIssueService
.
doGetEkpBankStatus
();
// 非扣税
icbcTransactionFlowIssueService
.
doGetEkpBankNoTaxStatus
();
return
R
.
ok
();
}
@Operation
(
summary
=
"定时任务获取回单文件"
,
description
=
"定时任务获取回单文件"
)
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
View file @
40e7a586
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.ekp.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -40,8 +41,11 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
// 查询主表下的全部数据
List
<
EkpBankExcelVo
>
getEkpBankExcelVoByIdAndMain
(
@Param
(
"fdParentId"
)
String
fdParentId
);
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndMainNoTax
(
@Param
(
"fdParentId"
)
String
fdParentId
);
// 查询详情里的1条数据
List
<
EkpBankExcelVo
>
getEkpBankExcelVoByIdAndDetail
(
@Param
(
"fdId"
)
String
fdId
);
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndDetailNoTax
(
@Param
(
"fdId"
)
String
fdId
);
// 编号查重
String
getWxNoByWxNo
(
@Param
(
"wxNo"
)
String
wxNo
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankPayTaskMapper.java
View file @
40e7a586
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -34,9 +35,9 @@ import java.util.List;
public
interface
EkpBankPayTaskMapper
extends
BaseMapper
<
EkpBankPayTask
>
{
// 获取发放中的主表,查询结果
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
();
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
(
@Param
(
"typeName"
)
String
typeName
);
// 获取发放中的明细表,查询结果
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
();
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
(
@Param
(
"typeName"
)
String
typeName
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
View file @
40e7a586
...
...
@@ -20,8 +20,8 @@ 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.EkpBankCodeConfiglVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -39,9 +39,12 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
// 查询下载的待发 明细数据
List
<
EkpBankExcelVo
>
getEkpBankExcelVoByIdAndMain
(
String
fdParentId
);
// 查询非扣税的待发 明细数据
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndMainNoTax
(
String
fdParentId
);
// 查询下载的待发 明细数据
List
<
EkpBankExcelVo
>
getEkpBankExcelVoByIdAndDetail
(
String
fdId
);
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndDetailNoTax
(
String
fdId
);
// 查询编码是否重复
String
getWxNoByWxNo
(
String
wxNo
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpBankPayTaskService.java
View file @
40e7a586
...
...
@@ -37,7 +37,7 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> {
* @Date: 2024-11-25 10:25:58
* @return: com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask
**/
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
();
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
(
String
typeName
);
/**
* @Description: 获取发放中的明细表,查询结果
...
...
@@ -45,6 +45,6 @@ public interface EkpBankPayTaskService extends IService<EkpBankPayTask> {
* @Date: 2024/11/25 10:38
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo>
**/
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
();
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
(
String
typeName
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowIssueService.java
View file @
40e7a586
...
...
@@ -79,13 +79,21 @@ public interface IcbcTransactionFlowIssueService extends IService<EkpSocialInfo>
void
exportAll
(
HttpServletResponse
response
);
/**
* @Description: 每小时获取银企付款结果
* @Description: 每小时获取银企付款结果
——工资
* @Author: hgw
* @Date: 2024/11/22 16:56
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
doGetEkpBankStatus
();
/**
* @Description: 每小时获取非扣税银企付款结果——非扣税
* @Author: hgw
* @Date: 2026/2/26 16:56
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
doGetEkpBankNoTaxStatus
();
R
getPdfFile
()
throws
IOException
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
40e7a586
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.icbc.api.DefaultIcbcClient
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.response.MybankEnterprisePayQpayentResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
java.util.List
;
...
...
@@ -54,8 +58,11 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
// 工行非税支付
// type 0 对公; 1 对私.
R
<
String
>
submitIcbcToNoTax
(
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelVo
>
detailList
,
int
type
,
String
fdId
);
,
List
<
EkpBankExcel
NoTax
Vo
>
detailList
,
int
type
,
String
fdId
);
R
submitSearch
();
// 查询非扣税结果
MybankEnterprisePayQpayentResponseV1
getResultNoTax
(
EkpBankResultVo
task
,
String
tranDate
,
String
tranTime
,
String
seqNo
,
DefaultIcbcClient
client
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
View file @
40e7a586
...
...
@@ -21,6 +21,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpBankGrantDetail;
import
com.yifu.cloud.plus.v1.ekp.mapper.EkpBankGrantDetailMapper
;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankGrantDetailService
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankCodeConfiglVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
@@ -50,10 +51,19 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
return
baseMapper
.
getEkpBankExcelVoByIdAndMain
(
fdParentId
);
}
@Override
public
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndMainNoTax
(
String
fdParentId
)
{
return
baseMapper
.
getEkpBankExcelVoByIdAndMainNoTax
(
fdParentId
);
}
@Override
public
List
<
EkpBankExcelVo
>
getEkpBankExcelVoByIdAndDetail
(
String
fdId
)
{
return
baseMapper
.
getEkpBankExcelVoByIdAndDetail
(
fdId
);
}
@Override
public
List
<
EkpBankExcelNoTaxVo
>
getEkpBankExcelVoByIdAndDetailNoTax
(
String
fdId
)
{
return
baseMapper
.
getEkpBankExcelVoByIdAndDetailNoTax
(
fdId
);
}
@Override
public
String
getWxNoByWxNo
(
String
wxNo
)
{
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpBankPayTaskServiceImpl.java
View file @
40e7a586
...
...
@@ -43,8 +43,8 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper,
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.entity.EkpBankPayTask>
**/
@Override
public
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
()
{
return
baseMapper
.
getEkpBankMainByNeedResultMain
();
public
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultMain
(
String
typeName
)
{
return
baseMapper
.
getEkpBankMainByNeedResultMain
(
typeName
);
}
/**
...
...
@@ -54,7 +54,7 @@ public class EkpBankPayTaskServiceImpl extends ServiceImpl<EkpBankPayTaskMapper,
* @return: java.util.List<com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo>
**/
@Override
public
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
()
{
return
baseMapper
.
getEkpBankMainByNeedResultDetail
();
public
List
<
EkpBankResultVo
>
getEkpBankMainByNeedResultDetail
(
String
typeName
)
{
return
baseMapper
.
getEkpBankMainByNeedResultDetail
(
typeName
);
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
40e7a586
This diff is collapsed.
Click to expand it.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
40e7a586
...
...
@@ -19,7 +19,9 @@ import com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankIcbcLogService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankResultVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
...
...
@@ -680,7 +682,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
// 改造自上面的demo接口:executePayment
// type 0 对公; 1 对私.
public
R
<
String
>
submitIcbcToNoTax
(
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelVo
>
detailList
,
int
type
,
String
fdId
)
{
,
List
<
EkpBankExcel
NoTax
Vo
>
detailList
,
int
type
,
String
fdId
)
{
// 获取当前时间
LocalTime
currentTime
=
LocalTime
.
now
();
// 使用DateTimeFormatter格式化
...
...
@@ -719,7 +721,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
List
<
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
>
rd
=
new
ArrayList
<>();
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
rdDetail
;
for
(
EkpBankExcelVo
detail
:
detailList
)
{
for
(
EkpBankExcel
NoTax
Vo
detail
:
detailList
)
{
// 0 对公
if
(
CommonConstants
.
ZERO_INT
==
type
)
{
rdDetail
=
buildPayRecordDuiGong
(
detail
);
...
...
@@ -809,6 +811,29 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
}
@Override
public
MybankEnterprisePayQpayentResponseV1
getResultNoTax
(
EkpBankResultVo
task
,
String
tranDate
,
String
tranTime
,
String
seqNo
,
DefaultIcbcClient
client
)
{
try
{
MybankEnterprisePayQpayentRequestV1
.
MybankEnterprisePayQpayentRequestBizV1
bizContent
=
new
MybankEnterprisePayQpayentRequestV1
.
MybankEnterprisePayQpayentRequestBizV1
();
MybankEnterprisePayQpayentRequestV1
request
=
new
MybankEnterprisePayQpayentRequestV1
();
bizContent
.
setTransCode
(
"QHISD"
);
bizContent
.
setTranDate
(
tranDate
);
bizContent
.
setTranTime
(
tranTime
);
bizContent
.
setLanguage
(
"zh_CN"
);
bizContent
.
setfSeqNo
(
seqNo
);
bizContent
.
setQryfSeqno
(
"null"
);
//待查平台交易序列号
bizContent
.
setQrySerialNo
(
task
.
getFdAttaSrc
());
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/qpayent/V1"
);
request
.
setBizContent
(
bizContent
);
return
client
.
execute
(
request
);
}
catch
(
Exception
e
)
{
log
.
error
(
"工行【非扣税】支付指令查询失败"
,
e
);
throw
new
RuntimeException
(
"【非扣税】支付指令查询失败"
,
e
);
}
}
// 对公
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecord
()
{
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
payRecord
=
...
...
@@ -924,7 +949,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
// 对公
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiGong
(
EkpBankExcelVo
detail
)
{
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiGong
(
EkpBankExcel
NoTax
Vo
detail
)
{
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
payRecord
=
new
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
();
...
...
@@ -975,11 +1000,12 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//用途代码
// payRecord.setPurposeCode(record.getPurposeCode());
//用途中文描述:用途代码和用途中文描述二选一上送
if
(
Common
.
isNotNull
(
detail
.
getFdRemittancePurpose
()))
{
if
(
detail
.
getFdRemittancePurpose
().
length
()>
20
)
{
detail
.
setFdRemittancePurpose
(
detail
.
getFdRemittancePurpose
().
substring
(
0
,
20
));
// 2026-02-27 李连琴要转款备注,若空,要二级分类
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
if
(
detail
.
getFdCoverRemark
().
length
()>
20
)
{
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
20
));
}
payRecord
.
setPurpose
(
detail
.
getFd
RemittancePurpose
());
payRecord
.
setPurpose
(
detail
.
getFd
CoverRemark
());
}
else
{
payRecord
.
setPurpose
(
"转账"
);
}
...
...
@@ -994,7 +1020,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//相关业务编号
// payRecord.setRelatedRefNo(record.getRelatedRefNo());
//ERP流水号
// payRecord.setErpSerialNo(record.getErpSerialNo
());
payRecord
.
setErpSerialNo
(
detail
.
getFdId
());
//ERP支票号
// payRecord.setErpCheckNo(record.getErpCheckNo());
//业务代码
...
...
@@ -1012,7 +1038,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
return
payRecord
;
}
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiSi
(
EkpBankExcelVo
detail
)
{
private
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
buildPayRecordDuiSi
(
EkpBankExcel
NoTax
Vo
detail
)
{
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
payRecord
=
new
MybankEnterprisePayPayentRequestV2
.
MybankEnterprisePayPayentRequestRdV2
();
//业务唯一编号:相同指令不重复
...
...
@@ -1055,14 +1081,16 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
//同城异地标志:1:同城;2:异地 非必填
payRecord
.
setSameCityFlag
(
""
);
payRecord
.
setAmount
(
Long
.
valueOf
(
detail
.
getFdMoney
()));
if
(
Common
.
isNotNull
(
detail
.
getFdRemittancePurpose
()))
{
if
(
detail
.
getFdRemittancePurpose
().
length
()>
20
)
{
detail
.
setFdRemittancePurpose
(
detail
.
getFdRemittancePurpose
().
substring
(
0
,
20
));
// 2026-02-27 李连琴要转款备注,若空,要二级分类
if
(
Common
.
isNotNull
(
detail
.
getFdCoverRemark
()))
{
if
(
detail
.
getFdCoverRemark
().
length
()>
20
)
{
detail
.
setFdCoverRemark
(
detail
.
getFdCoverRemark
().
substring
(
0
,
20
));
}
payRecord
.
setPurpose
(
detail
.
getFd
RemittancePurpose
());
payRecord
.
setPurpose
(
detail
.
getFd
CoverRemark
());
}
else
{
payRecord
.
setPurpose
(
"转账"
);
}
payRecord
.
setErpSerialNo
(
detail
.
getFdId
());
//摘要
//payRecord.setSummary("12");
return
payRecord
;
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
40e7a586
...
...
@@ -77,6 +77,32 @@
left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account
where
</sql>
<sql
id=
"Base_No_Tax_Sql"
>
select
DATE_FORMAT(now(),'%Y%m%d') nowDate,
'2' detailTag,
a.fd_serial_number fdSerialNumber,
'' baoXiaoNumber,
'0' danJuNumber,
m.fd_bank_name fdBankName,
m.fd_bank_no fdBankNo,
m.fd_bank_account fdBankAccount,
ifnull(c.fd_recipient_bank,a.fd_recipient_bank) fdRecipientBank,
'' fdRecipientAdress,
c.fd_recipient_bank_code fdRecipientBankCode,
'2' payType,
a.fd_payee_account fdPayeeAccount,
a.fd_payee_name fdPayeeName,
concat('',round(a.fd_money * 100,0)) fdMoney,
a.fd_remittance_purpose fdRemittancePurpose,
ifnull(a.fd_remark,'转账') fdCoverRemark,
a.fd_emp_phone fdEmpPhone,
a.fd_id fdId
from ekp_bank_grant_detail a
left join ekp_bank_pay_task m on a.fd_parent_id=m.fd_id
left join ekp_bank_code_set c on c.fd_payee_account=a.fd_payee_account
where
</sql>
<!-- 查询待发放条数 -->
<select
id=
"getCountByIdAndMain"
resultType=
"java.lang.Integer"
>
...
...
@@ -93,6 +119,13 @@
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询主表下的所有待发放数据 -->
<select
id=
"getEkpBankExcelVoByIdAndMainNoTax"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo"
>
<include
refid=
"Base_No_Tax_Sql"
/>
(a.fd_handle_status is null or a.fd_handle_status = '待发放') and a.fd_parent_id = #{fdParentId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询主表下的所有待发放数据 -->
<select
id=
"getEkpBankExcelVoByIdAndDetail"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo"
>
...
...
@@ -101,6 +134,13 @@
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询主表下的所有待发放数据 -->
<select
id=
"getEkpBankExcelVoByIdAndDetailNoTax"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelNoTaxVo"
>
<include
refid=
"Base_No_Tax_Sql"
/>
a.fd_handle_status = '待发放' and a.fd_id = #{fdId}
GROUP BY a.fd_id
ORDER BY (a.fd_serial_number-0) asc
</select>
<!-- 查询编号是否重复 -->
<select
id=
"getWxNoByWxNo"
resultType=
"java.lang.String"
>
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankPayTaskMapper.xml
View file @
40e7a586
...
...
@@ -91,9 +91,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,a.fd_bank_name fdBankName,a.fd_bank_no fdBankNo,a.fd_bank_account fdBankAccount
,a.fd_grant_num fdGrantNum
,a.fd_grant_num fdGrantNum
,a.fd_atta_src fdAttaSrc
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 = '发放中'
where a.fd_grant_status = '发放中'
and a.fd_pay_type = #{typeName}
GROUP BY a.fd_id
</select>
...
...
@@ -101,9 +101,11 @@
<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,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,d.fd_recipient_bank fdRecipientBank
,d.fd_grant_num fdGrantNum,d.fd_recipient_bank fdRecipientBank
,a.fd_atta_src fdAttaSrc,d.fd_money fdMoney
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 = '发放中'
where a.fd_grant_status = '已发放' and d.fd_grant_status = '发放失败' and d.fd_handle_status = '发放中'
and a.fd_pay_type = #{typeName}
</select>
</mapper>
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