Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
c9a297af
You need to sign in or sign up before continuing.
Commit
c9a297af
authored
Sep 05, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:新增结算信息和封面抬头"
parent
a4dab651
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
8 deletions
+36
-8
InsuranceDetailVO.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
+18
-3
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+16
-3
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+2
-2
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceDetailVO.java
View file @
c9a297af
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -179,10 +181,16 @@ public class InsuranceDetailVO implements Serializable {
...
@@ -179,10 +181,16 @@ public class InsuranceDetailVO implements Serializable {
private
Integer
reduceHandleStatus
;
private
Integer
reduceHandleStatus
;
/**
/**
* 结算办理状态 1待结算 2结算中 3已结算
*
预估
结算办理状态 1待结算 2结算中 3已结算
*/
*/
@Schema
(
description
=
"结算办理状态 1待结算 2结算中 3已结算"
)
@Schema
(
description
=
"预估结算办理状态 1待结算 2结算中 3已结算"
)
private
Integer
settleHandleStatus
;
private
String
estimateSettleStatus
;
/**
* 实缴结算办理状态 1待结算 2结算中 3已结算
*/
@Schema
(
description
=
"实缴结算办理状态 1待结算 2结算中 3已结算"
)
private
String
actualSettleStatus
;
/**
/**
* 是否出险 0未出险 1已出险
* 是否出险 0未出险 1已出险
...
@@ -342,4 +350,11 @@ public class InsuranceDetailVO implements Serializable {
...
@@ -342,4 +350,11 @@ public class InsuranceDetailVO implements Serializable {
*/
*/
@Schema
(
description
=
"退保结算状态 :预留字段,暂时都是空(减员类型专用)"
)
@Schema
(
description
=
"退保结算状态 :预留字段,暂时都是空(减员类型专用)"
)
private
String
surrenderSettleStatus
;
private
String
surrenderSettleStatus
;
/**
* 默认结算信息id
*/
@Schema
(
description
=
"默认结算信息id"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
defaultSettleId
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c9a297af
...
@@ -763,6 +763,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -763,6 +763,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
null
!=
insuranceDetailVO
){
if
(
null
!=
insuranceDetailVO
){
long
day
=
LocalDateUtil
.
betweenDay
(
insuranceDetailVO
.
getPolicyStart
().
toString
(),
insuranceDetailVO
.
getPolicyEnd
().
toString
());
long
day
=
LocalDateUtil
.
betweenDay
(
insuranceDetailVO
.
getPolicyStart
().
toString
(),
insuranceDetailVO
.
getPolicyEnd
().
toString
());
long
month
=
LocalDateUtil
.
betweenMonth
(
insuranceDetailVO
.
getPolicyStart
().
toString
(),
insuranceDetailVO
.
getPolicyEnd
().
toString
());
long
month
=
LocalDateUtil
.
betweenMonth
(
insuranceDetailVO
.
getPolicyStart
().
toString
(),
insuranceDetailVO
.
getPolicyEnd
().
toString
());
String
defaultSettleId
=
insuranceDetailVO
.
getDefaultSettleId
();
if
(
StringUtils
.
isNotBlank
(
defaultSettleId
)){
SettleVo
settleVo
=
getInsuranceDetailSettleStatus
(
id
,
defaultSettleId
);
if
(!
Common
.
isEmpty
(
settleVo
)){
insuranceDetailVO
.
setEstimateSettleStatus
(
settleVo
.
getEstimateStatus
());
insuranceDetailVO
.
setActualSettleStatus
(
settleVo
.
getActualStatus
());
}
}
//购买周期
//购买周期
String
buyCycle
=
month
+
"个月/"
+
day
+
"天"
;
String
buyCycle
=
month
+
"个月/"
+
day
+
"天"
;
insuranceDetailVO
.
setBuyCycle
(
buyCycle
);
insuranceDetailVO
.
setBuyCycle
(
buyCycle
);
...
@@ -878,6 +886,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -878,6 +886,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
ProjectSetInfoVo
jsonObject
=
data
.
get
(
record
.
getDeptNo
());
if
(
null
!=
jsonObject
){
if
(
null
!=
jsonObject
){
record
.
setProjectName
(
Optional
.
ofNullable
(
jsonObject
.
getDepartName
()).
orElse
(
""
));
record
.
setProjectName
(
Optional
.
ofNullable
(
jsonObject
.
getDepartName
()).
orElse
(
""
));
record
.
setInvoiceTitle
(
Optional
.
ofNullable
(
jsonObject
.
getInvoiceTitle
()).
orElse
(
""
));
}
}
//购买月数
//购买月数
record
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
record
.
getPolicyStart
().
toString
(),
record
.
getPolicyEnd
().
toString
()));
record
.
setBuyMonth
(
LocalDateUtil
.
betweenMonth
(
record
.
getPolicyStart
().
toString
(),
record
.
getPolicyEnd
().
toString
()));
...
@@ -1468,10 +1477,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -1468,10 +1477,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
}
}
//如果当前保单为单独结算
//如果当前保单为单独结算
if
(
settleType
==
CommonConstants
.
ZERO
_INT
){
if
(
settleType
==
CommonConstants
.
ONE
_INT
){
//推送过实缴信息且金额与本次不一致,则推送更新
//推送过实缴信息且金额与本次不一致,则推送更新
if
(
StringUtils
.
isNotBlank
(
defaultSettleId
)
if
(
StringUtils
.
isNotBlank
(
defaultSettleId
)
&&
(
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
detail
.
getActualPremium
())
!=
0
)){
&&
(
new
BigDecimal
(
success
.
getActualPremium
()).
compareTo
(
detail
.
getActualPremium
())
!=
0
)){
//推送保费更新
//推送保费更新
TInsuranceSettle
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
TInsuranceSettle
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
.
setActualPremium
(
new
BigDecimal
(
success
.
getActualPremium
()));
settle
.
setActualPremium
(
new
BigDecimal
(
success
.
getActualPremium
()));
...
@@ -3575,6 +3583,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3575,6 +3583,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceDetail
byId
=
getById
(
ekpInteractiveParam
.
getDetailId
());
TInsuranceDetail
byId
=
getById
(
ekpInteractiveParam
.
getDetailId
());
BeanCopyUtils
.
copyProperties
(
byId
,
ekpInteractiveParam
);
BeanCopyUtils
.
copyProperties
(
byId
,
ekpInteractiveParam
);
ekpInteractiveParam
.
setInteractiveType
(
InsurancesConstants
.
UPDATE_SETTLE_BILL
);
ekpInteractiveParam
.
setInteractiveType
(
InsurancesConstants
.
UPDATE_SETTLE_BILL
);
if
(
byId
.
getSettleType
()
==
CommonConstants
.
ZERO_INT
){
ekpInteractiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
}
else
{
ekpInteractiveParam
.
setEstimateStatus
(
EkpConstants
.
NOTHING
);
}
String
body
=
eKPInsuranceUtil
.
sendToEkp
(
ekpInteractiveParam
);
String
body
=
eKPInsuranceUtil
.
sendToEkp
(
ekpInteractiveParam
);
if
(!
StringUtils
.
isBlank
(
body
)){
if
(!
StringUtils
.
isBlank
(
body
)){
TInsuranceOperate
insuranceOperate
=
new
TInsuranceOperate
();
TInsuranceOperate
insuranceOperate
=
new
TInsuranceOperate
();
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
c9a297af
...
@@ -285,7 +285,6 @@
...
@@ -285,7 +285,6 @@
detail.SETTLE_MONTH as settleMonth,
detail.SETTLE_MONTH as settleMonth,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.REDUCE_HANDLE_STATUS as reduceHandleStatus,
detail.REDUCE_HANDLE_STATUS as reduceHandleStatus,
tis.SETTLE_HANDLE_STATUS as settleHandleStatus,
detail.IS_USE as isUse,
detail.IS_USE as isUse,
detail.IS_EFFECT as isEffect,
detail.IS_EFFECT as isEffect,
detail.IS_OVERDUE as isOverdue,
detail.IS_OVERDUE as isOverdue,
...
@@ -301,6 +300,7 @@
...
@@ -301,6 +300,7 @@
detail.CREATE_TIME as createTime,
detail.CREATE_TIME as createTime,
detail.REMARK as remark,
detail.REMARK as remark,
detail.BILLING_TYPE as billingType,
detail.BILLING_TYPE as billingType,
detail.DEFAULT_SETTLE_ID as defaultSettleId,
detail.RATE as rate
detail.RATE as rate
from t_insurance_detail detail
from t_insurance_detail detail
left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
...
...
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