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
6da783cd
Commit
6da783cd
authored
Mar 01, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1
parents
6c81db5d
0e51dae1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
17 deletions
+23
-17
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+5
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+18
-16
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
6da783cd
...
...
@@ -1940,7 +1940,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//如果当前保费为空,且保单号或发票号不一样
if
((
StringUtils
.
isBlank
(
success
.
getActualPremium
())
||
(
Common
.
isNotNull
(
detail
.
getActualPremium
())
if
((
Common
.
isEmpty
(
success
.
getActualPremium
())
||
(
Common
.
isNotNull
(
detail
.
getActualPremium
())
&&
Common
.
isNotNull
(
success
.
getActualPremium
())
&&
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
detail
.
getActualPremium
())
==
0
))
&&
(
booleanInvoiceNo
||
booleanPolicyNo
)
&&
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
()))
{
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
...
...
@@ -3589,6 +3589,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setErrorMessage
(
InsurancesConstants
.
ACTUAL_PREMIUM_EMPTY
);
continue
;
}
}
else
if
(
BigDecimal
.
ZERO
.
compareTo
(
detail
.
getActualPremium
())
==
0
&&
Common
.
isEmpty
(
param
.
getActualPremium
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
ACTUAL_PREMIUM_EMPTY
);
continue
;
}
//批增类型,保单号存在
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
6da783cd
...
...
@@ -931,6 +931,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
String
[]
areaArray
;
String
exitMoney
;
String
errorInfo
;
for
(
TPaymentInfoVo
infoVo
:
list
)
{
if
(
Common
.
isNotNull
(
infoVo
.
getEmpIdcard
()))
{
infoVo
.
setEmpIdcard
(
infoVo
.
getEmpIdcard
().
replace
(
"x"
,
"X"
));
...
...
@@ -1303,12 +1304,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setSocialHousehold
(
tSocialInfo
.
getSocialHouseholdName
());
}
// 项目信息校验
String
erroe
Info
=
settleInfoCheck
(
paymentInfo
);
if
(!
Common
.
isEmpty
(
erro
e
Info
)){
error
Info
=
settleInfoCheck
(
paymentInfo
);
if
(!
Common
.
isEmpty
(
erro
r
Info
)){
errorMessageMap
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_PRI
+
erro
e
Info
+
SocialConstants
.
ERROR_END
));
+
erro
r
Info
+
SocialConstants
.
ERROR_END
));
continue
;
}
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
...
...
@@ -1662,6 +1663,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
String
[]
areaArray
;
TSettleDomain
domain
;
String
errorInfo
;
for
(
TPaymentInfoVo
infoVo
:
list
)
{
if
(
Common
.
isNotNull
(
infoVo
.
getEmpIdcard
()))
{
infoVo
.
setEmpIdcard
(
infoVo
.
getEmpIdcard
().
replace
(
"x"
,
"X"
));
...
...
@@ -1784,7 +1786,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setUnitName
(
fund
.
getUnitNameFund
());
paymentInfo
.
setFundProvince
(
fund
.
getFundProvince
());
paymentInfo
.
setFundCity
(
fund
.
getFundCity
());
paymentInfo
.
setFundTown
(
fund
.
getFundTown
()
);
paymentInfo
.
setFundTown
(
Common
.
isNotNull
(
fund
.
getFundTown
())
?
fund
.
getFundTown
():
""
);
paymentInfo
.
setProvidentHousehold
(
fund
.
getProvidentHouseholdName
());
}
else
if
(
Common
.
isNotNull
(
tProvidentFund
))
{
paymentInfo
.
setEmpId
(
tProvidentFund
.
getEmpId
());
...
...
@@ -1810,21 +1812,21 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setSettleDomainCode
(
tProvidentFund
.
getSettleDomainCode
());
paymentInfo
.
setFundProvince
(
tProvidentFund
.
getFundProvince
());
paymentInfo
.
setFundCity
(
tProvidentFund
.
getFundCity
());
paymentInfo
.
setFundTown
(
tProvidentFund
.
getFundTown
()
);
paymentInfo
.
setFundTown
(
Common
.
isNotNull
(
tProvidentFund
.
getFundTown
())
?
tProvidentFund
.
getFundTown
():
""
);
paymentInfo
.
setProvidentHousehold
(
tProvidentFund
.
getProvidentHouseholdName
());
}
// 项目信息校验
String
erroe
Info
=
settleInfoCheck
(
paymentInfo
);
if
(!
Common
.
isEmpty
(
erro
e
Info
)){
error
Info
=
settleInfoCheck
(
paymentInfo
);
if
(!
Common
.
isEmpty
(
erro
r
Info
)){
errorMessageList
.
add
(
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
paymentInfo
.
getSocialHousehold
(),
paymentInfo
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_PRI
+
erro
e
Info
+
SocialConstants
.
ERROR_END
));
SocialConstants
.
ERROR_PRI
+
erro
r
Info
+
SocialConstants
.
ERROR_END
));
continue
;
}
if
(
Common
.
isNotNull
(
tProvidentFund
))
{
paymentInfo
.
setInauguralTeam
(
Common
.
isNotNull
(
tProvidentFund
.
getInauguralTeam
())
?
tProvidentFund
.
getInauguralTeam
():
""
);
paymentInfo
.
setEmpNo
(
tProvidentFund
.
getEmpNo
()
);
paymentInfo
.
setEmpNo
(
Common
.
isNotNull
(
tProvidentFund
.
getEmpNo
())
?
tProvidentFund
.
getEmpNo
():
""
);
}
else
{
paymentInfo
.
setInauguralTeam
(
""
);
paymentInfo
.
setEmpNo
(
""
);
...
...
@@ -2179,7 +2181,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
String
[]
areaArray
;
String
exitMoney
;
String
errorInfo
;
for
(
TPaymentHeFeiVo
infoVo
:
list
)
{
if
(
Common
.
isNotNull
(
infoVo
.
getEmpIdcard
()))
{
infoVo
.
setEmpIdcard
(
infoVo
.
getEmpIdcard
().
replace
(
"x"
,
"X"
));
...
...
@@ -2464,7 +2466,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setUnitName
(
Common
.
isNotNull
(
socialInfo
.
getUnitName
())
?
socialInfo
.
getUnitName
():
""
);
payExists
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
socialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
socialInfo
.
getSocialTown
()
);
payExists
.
setSocialTown
(
Common
.
isNotNull
(
socialInfo
.
getSocialTown
())
?
socialInfo
.
getSocialTown
():
""
);
payExists
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
}
else
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
payExists
.
setEmpId
(
tSocialInfo
.
getEmpId
());
...
...
@@ -2489,21 +2491,21 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setBpoFlag
(
domain
.
getBpoFlag
());
payExists
.
setSocialProvince
(
tSocialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
tSocialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
tSocialInfo
.
getSocialTown
()
);
payExists
.
setSocialTown
(
Common
.
isNotNull
(
tSocialInfo
.
getSocialTown
())
?
tSocialInfo
.
getSocialTown
():
""
);
payExists
.
setSocialHousehold
(
tSocialInfo
.
getSocialHouseholdName
());
}
// 项目信息校验
String
erroe
Info
=
settleInfoCheck
(
payExists
);
if
(!
Common
.
isEmpty
(
erro
e
Info
)){
error
Info
=
settleInfoCheck
(
payExists
);
if
(!
Common
.
isEmpty
(
erro
r
Info
)){
errorMessageList
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ZERO_INT
,
infoVo
.
getEmpIdcard
(),
payExists
.
getSocialHousehold
(),
payExists
.
getProvidentHousehold
(),
infoVo
.
getEmpName
(),
SocialConstants
.
ERROR_PRI
+
erro
e
Info
+
SocialConstants
.
ERROR_END
));
+
erro
r
Info
+
SocialConstants
.
ERROR_END
));
continue
;
}
if
(
Common
.
isNotNull
(
tSocialInfo
))
{
payExists
.
setInauguralTeam
(
Common
.
isNotNull
(
tSocialInfo
.
getInauguralTeam
())
?
tSocialInfo
.
getInauguralTeam
():
""
);
payExists
.
setEmpNo
(
tSocialInfo
.
getEmpNo
()
);
payExists
.
setEmpNo
(
Common
.
isNotNull
(
tSocialInfo
.
getEmpNo
())
?
tSocialInfo
.
getEmpNo
():
""
);
}
else
{
payExists
.
setInauguralTeam
(
""
);
payExists
.
setEmpNo
(
""
);
...
...
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