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
3defdec6
Commit
3defdec6
authored
Feb 25, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.20-非扣税银企
parent
92bb4f0f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
313 additions
and
21 deletions
+313
-21
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+3
-0
EkpBankPayTask.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
+1
-1
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+8
-0
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+52
-17
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+247
-2
TEmployeeInsurancePre.java
...plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
+2
-1
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
3defdec6
...
@@ -695,6 +695,9 @@ public interface CommonConstants {
...
@@ -695,6 +695,9 @@ public interface CommonConstants {
String
GU_DING
=
"gu_ding"
;
String
GU_DING
=
"gu_ding"
;
// 税友、关键字里的户:
// 税友、关键字里的户:
String
HU_CORE
=
"_户户_"
;
String
HU_CORE
=
"_户户_"
;
// 币种:ISO币种,仅支持人民币
String
CNY
=
"CNY"
;
String
ICBC_NAME
=
"工商"
;
// 前端客服角色ID(全服管理者)
// 前端客服角色ID(全服管理者)
long
CS_ROLE_ID
=
1839501715787390978L
;
long
CS_ROLE_ID
=
1839501715787390978L
;
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankPayTask.java
View file @
3defdec6
...
@@ -226,7 +226,7 @@ public class EkpBankPayTask {
...
@@ -226,7 +226,7 @@ public class EkpBankPayTask {
@Schema
(
description
=
"附件资源路径"
)
@Schema
(
description
=
"附件资源路径"
)
private
String
fdAttaSrc
;
private
String
fdAttaSrc
;
/**
/**
* 附件下载次数
* 附件下载次数
(非扣税10对公11对私)
*/
*/
@ExcelAttribute
(
name
=
"附件下载次数"
)
@ExcelAttribute
(
name
=
"附件下载次数"
)
@ExcelProperty
(
"附件下载次数"
)
@ExcelProperty
(
"附件下载次数"
)
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
3defdec6
...
@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
...
@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
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.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.vo.EkpBankExcelVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
java.util.List
;
/**
/**
* 聚富通到账通知交易流水查询
* 聚富通到账通知交易流水查询
*
*
...
@@ -48,6 +51,11 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
...
@@ -48,6 +51,11 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
R
executePayment
();
R
executePayment
();
// 工行非税支付
// type 0 对公; 1 对私.
R
<
String
>
submitIcbcToNoTax
(
String
totalAmt
,
String
totalCount
,
String
wxNo
,
List
<
EkpBankExcelVo
>
detailList
,
int
type
,
String
fdId
);
R
submitSearch
();
R
submitSearch
();
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
3defdec6
...
@@ -542,12 +542,24 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -542,12 +542,24 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
private
EkpBankAtta
getNewFileCore
(
String
fdId
,
String
type
,
EkpBankAttaReturnVo
vo
,
List
<
EkpBankExcelVo
>
list
private
EkpBankAtta
getNewFileCore
(
String
fdId
,
String
type
,
EkpBankAttaReturnVo
vo
,
List
<
EkpBankExcelVo
>
list
,
Map
<
String
,
EkpBankCodeConfiglVo
>
bankMap
)
{
,
Map
<
String
,
EkpBankCodeConfiglVo
>
bankMap
)
{
EkpBankCodeSet
codeSet
;
R
<
EkpBankCodeSet
>
bankInfoQuery
;
EkpBankCodeConfiglVo
bankVo
;
// 组装
// 组装
initFdRecipientBankCodeAndName
(
list
,
bankMap
);
String
batchNo
=
"WX"
+
new
Date
().
getTime
();
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
batchNo
);
if
(
Common
.
isNotNull
(
cur
))
{
batchNo
=
"WX"
+
new
Date
().
getTime
();
}
// 组装、上传文件
return
getEkpBankAttaVo
(
batchNo
,
vo
,
fdId
,
Integer
.
parseInt
(
type
),
list
);
}
// 初始化收款银行行号和行名
private
void
initFdRecipientBankCodeAndName
(
List
<
EkpBankExcelVo
>
list
,
Map
<
String
,
EkpBankCodeConfiglVo
>
bankMap
)
{
//工行的卡号bin list
//工行的卡号bin list
List
<
String
>
binList
=
baseMapper
.
getAllIcbcCardBinInfo
();
List
<
String
>
binList
=
baseMapper
.
getAllIcbcCardBinInfo
();
EkpBankCodeSet
codeSet
;
EkpBankCodeConfiglVo
bankVo
;
R
<
EkpBankCodeSet
>
bankInfoQuery
;
for
(
EkpBankExcelVo
excelVo
:
list
)
{
for
(
EkpBankExcelVo
excelVo
:
list
)
{
if
(
Common
.
isEmpty
(
excelVo
.
getFdRecipientBankCode
()))
{
if
(
Common
.
isEmpty
(
excelVo
.
getFdRecipientBankCode
()))
{
//工行的卡号通过bin来判断,如果是工行的卡号,则不需要行名行号
//工行的卡号通过bin来判断,如果是工行的卡号,则不需要行名行号
...
@@ -582,13 +594,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -582,13 +594,6 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
}
}
}
}
}
}
String
batchNo
=
"WX"
+
new
Date
().
getTime
();
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
batchNo
);
if
(
Common
.
isNotNull
(
cur
))
{
batchNo
=
"WX"
+
new
Date
().
getTime
();
}
// 组装、上传文件
return
getEkpBankAttaVo
(
batchNo
,
vo
,
fdId
,
Integer
.
parseInt
(
type
),
list
);
}
}
...
@@ -838,6 +843,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -838,6 +843,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
redisUtil
.
set
(
redisKey
,
600L
);
redisUtil
.
set
(
redisKey
,
600L
);
}
}
try
{
try
{
// 获取配置的行号
Map
<
String
,
EkpBankCodeConfiglVo
>
bankMap
=
ekpBankGrantDetailService
.
getEkpBankCodeConfiglVo
();
// 1主表
// 1主表
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
EkpBankPayTask
main
=
ekpBankPayTaskService
.
getById
(
fdId
);
EkpBankPayTask
main
=
ekpBankPayTaskService
.
getById
(
fdId
);
...
@@ -857,10 +864,25 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -857,10 +864,25 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
main
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
main
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
String
.
valueOf
(
count
);
String
totalCount
=
String
.
valueOf
(
count
);
String
wxNo
=
main
.
getFdWxNo
();
String
wxNo
=
main
.
getFdWxNo
();
String
url
=
main
.
getFdAttaName
();
if
(
Common
.
isEmpty
(
wxNo
))
{
String
mdCode
=
main
.
getFdMdCode
();
wxNo
=
"FKS"
+
new
Date
().
getTime
();
// TODO -真正的发放接口需要改造
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
R
<
String
>
returnR
=
submitIcbcTransactionFlow
(
totalAmt
,
totalCount
,
wxNo
,
url
,
mdCode
);
if
(
Common
.
isNotNull
(
cur
))
{
wxNo
=
"FKS"
+
new
Date
().
getTime
();
}
main
.
setFdWxNo
(
wxNo
);
// 更新wxno
ekpBankPayTaskService
.
updateById
(
main
);
}
List
<
EkpBankExcelVo
>
detailList
=
ekpBankGrantDetailService
.
getEkpBankExcelVoByIdAndMain
(
fdId
);
// 初始化收款银行行号和行名
initFdRecipientBankCodeAndName
(
detailList
,
bankMap
);
// 0对公1对私
int
noTaxPayType
=
CommonConstants
.
ZERO_INT
;
if
(
Common
.
isNotNull
(
main
.
getFdDownloadNum
())
&&
11
==
main
.
getFdDownloadNum
())
{
noTaxPayType
=
CommonConstants
.
ONE_INT
;
}
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
);
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
// 存储日志
// 存储日志
saveIcbcLogBaseInfoBySumbit
(
returnR
.
getData
(),
wxNo
+
"_main"
,
fdId
);
saveIcbcLogBaseInfoBySumbit
(
returnR
.
getData
(),
wxNo
+
"_main"
,
fdId
);
...
@@ -895,9 +917,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -895,9 +917,22 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
detail
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalAmt
=
String
.
valueOf
(
BigDecimalUtils
.
safeMultiply
(
detail
.
getFdMoney
(),
new
BigDecimal
(
"100"
),
0
));
String
totalCount
=
"1"
;
String
totalCount
=
"1"
;
String
wxNo
=
detail
.
getFdWxNo
();
String
wxNo
=
detail
.
getFdWxNo
();
String
url
=
detail
.
getFdAttaName
();
if
(
Common
.
isEmpty
(
wxNo
))
{
String
mdCode
=
detail
.
getFdMdCode
();
wxNo
=
"FKSMX"
+
new
Date
().
getTime
();
R
<
String
>
returnR
=
submitIcbcTransactionFlow
(
totalAmt
,
totalCount
,
wxNo
,
url
,
mdCode
);
String
cur
=
ekpBankGrantDetailService
.
getWxNoByWxNo
(
wxNo
);
if
(
Common
.
isNotNull
(
cur
))
{
wxNo
=
"FKSMX"
+
new
Date
().
getTime
();
}
detail
.
setFdWxNo
(
wxNo
);
ekpBankGrantDetailService
.
updateById
(
detail
);
}
// 0对公1对私
int
noTaxPayType
=
CommonConstants
.
ZERO_INT
;
if
(
Common
.
isNotNull
(
detail
.
getFdDownloadNum
())
&&
11
==
detail
.
getFdDownloadNum
())
{
noTaxPayType
=
CommonConstants
.
ONE_INT
;
}
List
<
EkpBankExcelVo
>
detailList
=
ekpBankGrantDetailService
.
getEkpBankExcelVoByIdAndDetail
(
fdId
);
R
<
String
>
returnR
=
icbcTransactionFlowQueryService
.
submitIcbcToNoTax
(
totalAmt
,
totalCount
,
wxNo
,
detailList
,
noTaxPayType
,
fdId
);
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
if
(
returnR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
// 存储日志
// 存储日志
saveIcbcLogBaseInfoBySumbit
(
returnR
.
getData
(),
wxNo
,
fdId
);
saveIcbcLogBaseInfoBySumbit
(
returnR
.
getData
(),
wxNo
,
fdId
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
3defdec6
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
View file @
3defdec6
...
@@ -156,8 +156,9 @@ public class TEmployeeInsurancePre extends BaseEntity {
...
@@ -156,8 +156,9 @@ public class TEmployeeInsurancePre extends BaseEntity {
@JsonIgnore
@JsonIgnore
private
LocalDateTime
errorTime
;
private
LocalDateTime
errorTime
;
// TEmployeeInsurancePre.processStatus = "状态,0待确认,1待派单,2派单失败,3待投保,4投保中,5投保退回,6已完成,7待缴费"
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@Schema
(
description
=
"修改类型:1新增;2修改;3删除;4状态346为不可编辑"
)
@Schema
(
description
=
"修改类型:1新增;2修改;3删除;4状态346
7
为不可编辑"
)
private
String
modelType
;
private
String
modelType
;
/**
/**
* 是否拒绝入职: 0 是 1 否
* 是否拒绝入职: 0 是 1 否
...
...
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