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
ffc27e4c
Commit
ffc27e4c
authored
Dec 12, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
cc7fc847
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
495 additions
and
484 deletions
+495
-484
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+495
-484
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
ffc27e4c
...
...
@@ -61,7 +61,6 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
import
com.yifu.cloud.plus.v1.yifu.social.util.DoJointSocialTask
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -2553,19 +2552,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
YifuUser
user
=
SecurityUtils
.
getUser
();
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_PUSH
;
redisUtil
.
set
(
key
,
user
.
getId
(),
36000L
);
try
{
//手动推送未推送的社保公积金明细数据
createPaymentSocialInfoReal
(
user
,
searchVo
);
createPaymentFundInfoReal
(
user
,
searchVo
);
createPaymentSocialInfoReal
(
user
,
searchVo
);
createPaymentFundInfoReal
(
user
,
searchVo
);
//推送社保公积金收入数据
createPaymentInfoIncomeReal
(
user
,
searchVo
);
createPaymentFundIncomeReal
(
user
,
searchVo
);
redisUtil
.
remove
(
key
);
}
catch
(
Exception
e
)
{
log
.
error
(
"社保缴费库:"
+
e
);
createPaymentInfoIncomeReal
(
user
,
searchVo
);
createPaymentFundIncomeReal
(
user
,
searchVo
);
redisUtil
.
remove
(
key
);
}
}
@Override
public
R
<
Boolean
>
batchUpdatePaymentInfo
(
TPaymentInfoSearchVo
searchVo
)
{
...
...
@@ -2746,22 +2741,25 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
public
void
initEkpPushSocialParam
(
List
<
TPaymentInfo
>
unPushInfo
)
{
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
//获取所有的项目编码
List
<
String
>
deptNoList
=
unPushInfo
.
stream
().
map
(
TPaymentInfo:
:
getSettleDomainCode
).
collect
(
Collectors
.
toList
());
//获取对应项目信息
Map
<
String
,
TSettleDomain
>
data
=
new
HashMap
<>();
TSettleDomain
settleDomain
;
try
{
R
<
TSettleDomainListVo
>
infoByCodes
=
archivesDaprUtil
.
getSettleInfoByCodes
(
deptNoList
);
if
(
null
!=
infoByCodes
&&
Common
.
isNotNull
(
infoByCodes
.
getData
())
&&
Common
.
isNotNull
(
infoByCodes
.
getData
().
getMapVO
()))
{
data
=
infoByCodes
.
getData
().
getMapVO
();
}
for
(
TPaymentInfo
library
:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
if
(
Common
.
isNotNull
(
data
))
{
settleDomain
=
data
.
get
(
library
.
getSettleDomainCode
());
}
else
{
settleDomain
=
new
TSettleDomain
();
}
EkpPushSocialParam
socialParam
=
new
EkpPushSocialParam
();
//员工姓名
socialParam
.
setFd_3adfe8c79989d4
(
library
.
getEmpName
());
...
...
@@ -2809,7 +2807,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//订单类型
socialParam
.
setFd_3add9dd7833db8
(
SocialConstants
.
DIFF_TYPE_THR
);
//是否有预估
if
(
Common
.
isNotNull
(
settleDomain
.
getSocialType
())
&&
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getSocialType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getSocialType
()))
{
socialParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
}
else
{
...
...
@@ -2824,13 +2822,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//单号
socialParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
socialParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//是否为BPO业务
if
(
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
socialParam
.
setFd_3b178dfcf9e3e6
(
settleDomain
.
getBpoFlag
());
}
else
{
socialParam
.
setFd_3b178dfcf9e3e6
(
CommonConstants
.
EMPTY_STRING
);
...
...
@@ -2981,24 +2979,29 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
socialParam
.
setFd_3b3cab77923f44
(
CommonConstants
.
EMPTY_STRING
);
doJointSocialTask
.
asynchronousEkpPaymentSocial
(
socialParam
,
library
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"生成社保明细异常"
,
e
);
}
}
public
void
initEkpPushFundParam
(
List
<
TPaymentInfo
>
unPushInfo
)
{
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
//获取所有的项目编码
List
<
String
>
deptNoList
=
unPushInfo
.
stream
().
map
(
TPaymentInfo:
:
getSettleDomainCode
).
collect
(
Collectors
.
toList
());
//获取对应项目信息
Map
<
String
,
TSettleDomain
>
data
=
new
HashMap
<>();
TSettleDomain
settleDomain
;
try
{
R
<
TSettleDomainListVo
>
infoByCodes
=
archivesDaprUtil
.
getSettleInfoByCodes
(
deptNoList
);
if
(
null
!=
infoByCodes
&&
Common
.
isNotNull
(
infoByCodes
.
getData
())
&&
Common
.
isNotNull
(
infoByCodes
.
getData
().
getMapVO
()))
{
data
=
infoByCodes
.
getData
().
getMapVO
();
}
for
(
TPaymentInfo
library
:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
if
(
Common
.
isNotNull
(
data
))
{
settleDomain
=
data
.
get
(
library
.
getSettleDomainCode
());
}
else
{
settleDomain
=
new
TSettleDomain
();
}
EkpPushFundParam
fundParam
=
new
EkpPushFundParam
();
//员工姓名
...
...
@@ -3027,7 +3030,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//订单类型
fundParam
.
setFd_3add9dd7833db8
(
SocialConstants
.
DIFF_TYPE_THR
);
//是否有预估
if
(
Common
.
isNotNull
(
settleDomain
.
getFundType
())
&&
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getFundType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getFundType
()))
{
fundParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
}
else
{
...
...
@@ -3042,13 +3045,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//单号
fundParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
fundParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//是否为BPO业务
if
(
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
if
(
Common
.
isNotNull
(
settleDomain
)
&&
Common
.
isNotNull
(
settleDomain
.
getBpoFlag
()))
{
fundParam
.
setFd_3b178ea361cabe
(
settleDomain
.
getBpoFlag
());
}
else
{
fundParam
.
setFd_3b178ea361cabe
(
CommonConstants
.
EMPTY_STRING
);
...
...
@@ -3111,6 +3114,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
doJointSocialTask
.
asynchronousEkpPaymentFund
(
fundParam
,
library
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"生成公积金明细异常"
,
e
);
}
}
public
void
signIncomeFlag
(
List
<
TPaymentInfo
>
updateList
)
{
...
...
@@ -3156,6 +3162,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
public
void
createIncomeInfo
(
List
<
TPaymentInfo
>
updateList
,
String
socialFundFlag
)
{
List
<
TIncomeDetail
>
exitIncome
;
//获取所有的项目编码
List
<
String
>
deptNoList
=
updateList
.
stream
().
map
(
TPaymentInfo:
:
getSettleDomainCode
).
collect
(
Collectors
.
toList
());
//获取对应项目信息
Map
<
String
,
TSettleDomain
>
data
=
new
HashMap
<>();
TSettleDomain
settleDomain
;
try
{
R
<
TSettleDomainListVo
>
infoByCodes
=
archivesDaprUtil
.
getSettleInfoByCodes
(
deptNoList
);
if
(
null
!=
infoByCodes
&&
Common
.
isNotNull
(
infoByCodes
.
getData
())
&&
Common
.
isNotNull
(
infoByCodes
.
getData
().
getMapVO
()))
{
data
=
infoByCodes
.
getData
().
getMapVO
();
}
for
(
TPaymentInfo
paymentInfo
:
updateList
)
{
boolean
exitFlag
=
false
;
if
(
CommonConstants
.
ONE_STRING
.
equals
(
socialFundFlag
))
{
...
...
@@ -3189,18 +3205,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
;
R
<
TSettleDomainListVo
>
listVo
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
paymentInfo
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
if
(
Common
.
isNotNull
(
data
))
{
settleDomain
=
data
.
get
(
paymentInfo
.
getSettleDomainCode
());
}
else
{
settleDomain
=
new
TSettleDomain
();
}
int
isSum
=
0
;
...
...
@@ -3273,6 +3281,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"生成社保收入异常"
,
e
);
}
}
public
void
createIncomeInsurance
(
TPaymentInfo
library
,
TSettleDomain
settleDomain
,
String
feeType
,
...
...
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