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
a6d6490b
Commit
a6d6490b
authored
Dec 26, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-商险变更项目逻辑修改
parent
c02698d4
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
219 additions
and
17 deletions
+219
-17
DeptChangeCheckParam.java
...loud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
+13
-0
DeptSettleVo.java
...m/yifu/cloud/plus/v1/yifu/insurances/vo/DeptSettleVo.java
+36
-0
EkpSettleMapper.java
...d/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
+19
-0
EkpSettleService.java
...plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
+5
-0
EkpSettleServiceImpl.java
...ifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
+11
-0
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+4
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+102
-17
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+29
-0
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @
a6d6490b
...
...
@@ -156,7 +156,20 @@ public class DeptChangeCheckParam implements Serializable {
* 客户编码
*/
@Schema
(
description
=
"客户编码"
)
private
String
oldCustomerCode
;
@Schema
(
description
=
"结算状态"
)
private
String
settleStatus
;
@Schema
(
description
=
"支出结算状态"
)
private
String
paySettleStatus
;
@Schema
(
description
=
"预估结算状态"
)
private
String
ygSettleStatus
;
@Schema
(
description
=
"预估支出结算状态"
)
private
String
ygPaySettleStatus
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptSettleVo.java
0 → 100644
View file @
a6d6490b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @author huyc
* @description EKP结算信息表
* @date 2024-12-25 17:37:21
*/
@Data
@Tag
(
name
=
"EKP结算信息表"
)
public
class
DeptSettleVo
implements
Serializable
{
/**
* 主键id
*/
private
String
id
;
/**
* 结算id
*/
@Schema
(
description
=
"结算id"
)
private
String
detailId
;
@Schema
(
description
=
"结算状态"
)
private
String
settleStatus
;
@Schema
(
description
=
"支出结算状态"
)
private
String
paySettleStatus
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
View file @
a6d6490b
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
mapper
.
ekp
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
...
...
@@ -24,6 +25,24 @@ public interface EkpSettleMapper {
*/
SettleVo
getSettle
(
String
id
);
/**
* 获取结算信息
*
* @author zhaji
* @param id
* @return {@link SettleVo}
*/
DeptSettleVo
getDeptSettle
(
String
id
);
/**
* 获取结算信息
*
* @author zhaji
* @param id
* @return {@link SettleVo}
*/
DeptSettleVo
getDeptYgSettle
(
String
id
);
/**
* 从商险订单明细中获取当前保单的结算状态
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
View file @
a6d6490b
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
...
...
@@ -25,6 +26,10 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
*/
SettleVo
getSettle
(
String
id
);
DeptSettleVo
getDeptSettle
(
String
id
);
DeptSettleVo
getDeptYgSettle
(
String
id
);
/**
* 从商险订单明细中获取当前保单的结算状态
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
View file @
a6d6490b
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo
;
...
...
@@ -31,6 +32,16 @@ public class EkpSettleServiceImpl implements EkpSettleService {
return
ekpSettleMapper
.
getSettle
(
id
);
}
@Override
public
DeptSettleVo
getDeptSettle
(
String
id
)
{
return
ekpSettleMapper
.
getDeptSettle
(
id
);
}
@Override
public
DeptSettleVo
getDeptYgSettle
(
String
id
)
{
return
ekpSettleMapper
.
getDeptYgSettle
(
id
);
}
@Override
public
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
)
{
return
ekpSettleMapper
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
a6d6490b
...
...
@@ -468,6 +468,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
SettleVo
getInsuranceDetailSettleStatus
(
String
detailId
,
String
defaultSettleId
);
DeptSettleVo
deptUpdGetSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
defaultSettleId
);
DeptSettleVo
deptYgGetSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
defaultSettleId
);
/**
* @param changeDeptVo
* @Description: ekp费用划转,商险划转项目
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
a6d6490b
...
...
@@ -5117,6 +5117,25 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
threadPool
.
execute
(()
->
{
for
(
DeptChangeCheckParam
success
:
successList
)
{
//取出预估和实缴的是否需要推送的状态
boolean
sjFlag
=
true
;
boolean
ygFlag
=
true
;
if
((
Common
.
isNotNull
(
success
.
getSettleStatus
())
&&
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
success
.
getSettleStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
success
.
getSettleStatus
())))
||
(
Common
.
isNotNull
(
success
.
getPaySettleStatus
())
&&
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
success
.
getPaySettleStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
success
.
getPaySettleStatus
())))){
sjFlag
=
false
;
}
if
((
Common
.
isNotNull
(
success
.
getYgSettleStatus
())
&&
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
success
.
getYgSettleStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
success
.
getYgSettleStatus
())))
||
(
Common
.
isNotNull
(
success
.
getYgPaySettleStatus
())
&&
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
success
.
getYgPaySettleStatus
())
||
InsurancesConstants
.
SETTLE_TWO
.
equals
(
success
.
getYgPaySettleStatus
())))){
ygFlag
=
false
;
}
//新的结算信息
TInsuranceSettle
newInsuranceSettle
=
new
TInsuranceSettle
();
//实际保费
...
...
@@ -5175,7 +5194,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//如果变更前为单独结算
if
(
CommonConstants
.
ONE_INT
==
oldSettleType
){
//登记了保单保费
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
))
{
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)
&&
sjFlag
)
{
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
newInsuranceSettle
.
setSettleType
(
newSettleType
);
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ZERO_INT
);
...
...
@@ -5458,20 +5477,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
oldDefaultSettleId
);
//如果已经登记保费
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
//新增新的结算信息
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
newInsuranceSettle
.
setSettleType
(
newSettleType
);
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setSettleHandleStatus
(
CommonConstants
.
ONE_STRING
);
newInsuranceSettle
.
setCreateTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setActualPremium
(
success
.
getActualPremium
());
newInsuranceSettle
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//如果预估和实缴都推送了
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ONE_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ONE_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
&&
(
ygFlag
||
sjFlag
)){
//新增新的结算信息
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
newInsuranceSettle
.
setSettleType
(
newSettleType
);
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setSettleHandleStatus
(
CommonConstants
.
ONE_STRING
);
newInsuranceSettle
.
setCreateTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setActualPremium
(
success
.
getActualPremium
());
newInsuranceSettle
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//推送作废结算信息至EKP
interactiveParam
.
setCustomerCode
(
success
.
getOldCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getOldCustomerName
());
...
...
@@ -5601,7 +5621,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//如果预估已推送和实缴未推送
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
&&
ygFlag
){
//新增新的结算信息
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
newInsuranceSettle
.
setSettleType
(
newSettleType
);
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setSettleHandleStatus
(
CommonConstants
.
ONE_STRING
);
newInsuranceSettle
.
setCreateTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setActualPremium
(
success
.
getActualPremium
());
newInsuranceSettle
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//推送作废结算信息至EKP
interactiveParam
.
setCustomerCode
(
success
.
getOldCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getOldCustomerName
());
...
...
@@ -5676,7 +5709,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//如果预估和实缴均未推送
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
if
(
byId
.
getIsActualPush
()
==
CommonConstants
.
ZERO_INT
&&
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
//新增新的结算信息
newInsuranceSettle
.
setInsDetailId
(
insuranceDetailId
);
newInsuranceSettle
.
setSettleType
(
newSettleType
);
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ZERO_INT
);
newInsuranceSettle
.
setSettleHandleStatus
(
CommonConstants
.
ONE_STRING
);
newInsuranceSettle
.
setCreateTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setActualPremium
(
success
.
getActualPremium
());
newInsuranceSettle
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//先推送预估,再推送实际
interactiveParam
.
setDefaultSettleId
(
newInsuranceSettle
.
getId
());
interactiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
...
...
@@ -5722,7 +5768,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//如果没有登记保费
if
(
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
if
(
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
if
(
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
&&
ygFlag
){
interactiveParam
.
setCustomerCode
(
success
.
getOldCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getOldCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getOldDeptNo
());
...
...
@@ -6965,8 +7011,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
continue
;
}
}
DeptSettleVo
deptSettleVo
=
deptUpdGetSettleStatusFromEkpInsuranceDetail
(
insuranceDetail
.
getId
(),
defaultSettleId
);
if
(
Common
.
isNotNull
(
deptSettleVo
)){
param
.
setSettleStatus
(
deptSettleVo
.
getSettleStatus
());
param
.
setPaySettleStatus
(
deptSettleVo
.
getPaySettleStatus
());
}
DeptSettleVo
deptYgSettleVo
=
deptYgGetSettleStatusFromEkpInsuranceDetail
(
insuranceDetail
.
getId
(),
defaultSettleId
);
if
(
Common
.
isNotNull
(
deptYgSettleVo
)){
param
.
setYgSettleStatus
(
deptYgSettleVo
.
getSettleStatus
());
param
.
setYgPaySettleStatus
(
deptYgSettleVo
.
getPaySettleStatus
());
}
}
}
//预估
if
(
param
.
getNewSettleType
()
==
CommonConstants
.
ZERO_INT
){
//按月
...
...
@@ -7401,6 +7458,34 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return
ekpSettleService
.
getSettle
(
id
);
}
/**
* 获取当前保单的结算状态
*
* @author huyc
* @param
* @return {@link String}
*/
@Override
public
DeptSettleVo
deptUpdGetSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
settleId
){
String
id
=
detailId
+
CommonConstants
.
DOWN_LINE_STRING
+
settleId
;
//获取ekp结算信息
return
ekpSettleService
.
getDeptSettle
(
id
);
}
/**
* 获取当前保单的结算状态
*
* @author huyc
* @param
* @return {@link String}
*/
@Override
public
DeptSettleVo
deptYgGetSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
settleId
){
String
id
=
detailId
+
CommonConstants
.
DOWN_LINE_STRING
+
settleId
;
//获取ekp结算信息
return
ekpSettleService
.
getDeptYgSettle
(
id
);
}
/**
* 从商险订单明细中获取当前保单的结算状态
*
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @
a6d6490b
...
...
@@ -11,6 +11,13 @@
<result
property=
"actualStatus"
column=
"fd_3b05bd5ed0b976"
jdbcType=
"VARCHAR"
/>
</resultMap>
<resultMap
id=
"BaseDeptResultMap"
type=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo"
>
<id
property=
"id"
column=
"fd_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"detailId"
column=
"fd_3b0a5743acab7e"
jdbcType=
"VARCHAR"
/>
<result
property=
"settleStatus"
column=
"fd_3adfe6ec6a8cbe"
jdbcType=
"VARCHAR"
/>
<result
property=
"paySettleStatus"
column=
"fd_3adfe6eda67236"
jdbcType=
"VARCHAR"
/>
</resultMap>
<resultMap
id=
"BaseResultStatusMap"
type=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo"
>
<id
property=
"id"
column=
"detailsId"
jdbcType=
"VARCHAR"
/>
<result
property=
"incomeSettleFlag"
column=
"earningStatus"
jdbcType=
"VARCHAR"
/>
...
...
@@ -37,6 +44,10 @@
detailsId,earningStatus,receiptStatus,zhichuEarningStatus,payStatus,orderType
</sql>
<sql
id=
"Base_Column_Dept"
>
fd_id,fd_3b0a5743acab7e,fd_3adfe6ec6a8cbe,fd_3adfe6eda67236
</sql>
<select
id=
"getSettle"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
></include>
...
...
@@ -55,6 +66,24 @@
fd_3b0a5743acab7e = #{id} limit 1
</select>
<select
id=
"getDeptSettle"
resultMap=
"BaseDeptResultMap"
>
select
<include
refid=
"Base_Column_Dept"
></include>
from
ekp_e96a0a28442447c81ec0
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '实缴' limit 1
</select>
<select
id=
"getDeptYgSettle"
resultMap=
"BaseDeptResultMap"
>
select
<include
refid=
"Base_Column_Dept"
></include>
from
ekp_e96a0a28442447c81ec0
where
fd_3b0a5743acab7e = #{id} and fd_3adfe6af71a1cc = '预估' limit 1
</select>
<!-- 根据结算单编码获取视图信息 -->
<select
id=
"selectSettleStatusBySettleNo"
resultMap=
"BaseResultStatusMap"
>
select
...
...
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