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
2452ffca
Commit
2452ffca
authored
Aug 01, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.14-商险已支出,无法登记保单保费
parent
a166fe9f
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
15 deletions
+52
-15
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+4
-0
EkpSettleStatusVo.java
...u/cloud/plus/v1/yifu/insurances/vo/EkpSettleStatusVo.java
+25
-0
EkpSettleMapper.java
...d/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
+1
-1
EkpSettleService.java
...plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
+1
-1
EkpSettleServiceImpl.java
...ifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+18
-10
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+2
-2
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
2452ffca
...
@@ -468,6 +468,10 @@ public class InsurancesConstants {
...
@@ -468,6 +468,10 @@ public class InsurancesConstants {
* 商险已结算,无法登记保单保费
* 商险已结算,无法登记保单保费
*/
*/
public
static
final
String
SETTLE_HANDLE_THREE_NOT_REGISTERED
=
"商险已结算,无法登记保单保费"
;
public
static
final
String
SETTLE_HANDLE_THREE_NOT_REGISTERED
=
"商险已结算,无法登记保单保费"
;
/**
* 商险已支出,无法登记保单保费
*/
public
static
final
String
PAY_SETTLE_NOT_REGISTERED
=
"商险已支出,无法登记保单保费"
;
/**
/**
* 保单号不存在或已过期
* 保单号不存在或已过期
*/
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpSettleStatusVo.java
0 → 100644
View file @
2452ffca
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Description: 查询EKP中的状态,拦截批量保单号保费
* @Author: hgw
* @Date: 2025/8/1 18:02
* @return:
**/
@Data
public
class
EkpSettleStatusVo
implements
Serializable
{
/**
* 结算状态
**/
private
String
settleStatus
;
/**
* 支出状态
**/
private
String
payStatus
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java
View file @
2452ffca
...
@@ -47,7 +47,7 @@ public interface EkpSettleMapper {
...
@@ -47,7 +47,7 @@ public interface EkpSettleMapper {
* @param id
* @param id
* @return {@link SettleVo}
* @return {@link SettleVo}
*/
*/
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
EkpSettleStatusVo
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
List
<
EkpInsuranceViewVo
>
selectSettleStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
List
<
EkpInsuranceViewVo
>
selectSettleStatusBySettleNo
(
@Param
(
"settleNo"
)
String
settleNo
,
@Param
(
"payFlag"
)
String
payFlag
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/EkpSettleService.java
View file @
2452ffca
...
@@ -36,7 +36,7 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
...
@@ -36,7 +36,7 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
* @param id 新增类
* @param id 新增类
* @return {@link R}
* @return {@link R}
*/
*/
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
EkpSettleStatusVo
getSettleStatusFromEkpInsuranceDetail
(
String
id
);
/**
/**
* 根据结算单编号查询商险视图信息
* 根据结算单编号查询商险视图信息
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java
View file @
2452ffca
...
@@ -45,7 +45,7 @@ public class EkpSettleServiceImpl implements EkpSettleService {
...
@@ -45,7 +45,7 @@ public class EkpSettleServiceImpl implements EkpSettleService {
}
}
@Override
@Override
public
String
getSettleStatusFromEkpInsuranceDetail
(
String
id
)
{
public
EkpSettleStatusVo
getSettleStatusFromEkpInsuranceDetail
(
String
id
)
{
return
ekpSettleMapper
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
return
ekpSettleMapper
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
2452ffca
...
@@ -3863,7 +3863,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3863,7 +3863,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
InsuranceRegisterParam
param
;
InsuranceRegisterParam
param
;
SettleVo
settleVo
;
SettleVo
settleVo
;
List
<
TInsuranceEkp
>
ekpList
;
List
<
TInsuranceEkp
>
ekpList
;
String
status
;
// EKP 结算状态、支出状态
EkpSettleStatusVo
settleStatus
;
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
distinctList
.
size
();
i
++)
{
param
=
distinctList
.
get
(
i
);
param
=
distinctList
.
get
(
i
);
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
param
.
setFlag
(
CommonConstants
.
ONE_STRING
);
...
@@ -4052,18 +4053,25 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -4052,18 +4053,25 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
if
(
StringUtils
.
isNotBlank
(
detail
.
getDefaultSettleId
())){
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
settle
=
tInsuranceSettleService
.
getById
(
detail
.
getDefaultSettleId
());
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
if
(
Optional
.
ofNullable
(
settle
).
isPresent
()){
status
=
getSettleStatusFromEkpInsuranceDetail
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
settleStatus
=
getSettleStatusFromEkpInsuranceDetail
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(
null
!=
status
){
if
(
null
!=
settleStatus
){
if
(
Common
.
isNotNull
(
settleStatus
.
getSettleStatus
()))
{
//保费更新或者保单号发票号更新
//保费更新或者保单号发票号更新
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
status
))
{
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getSettleStatus
()
))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
continue
;
continue
;
}
}
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
status
))
{
if
(
InsurancesConstants
.
SETTLE_ONE
.
equals
(
settleStatus
.
getSettleStatus
()
))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_TWO_NOT_REGISTERED
);
continue
;
continue
;
}
}
}
}
// 商险已支出,无法登记保单保费
if
(
Common
.
isNotNull
(
settleStatus
.
getPayStatus
())
&&
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getPayStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
PAY_SETTLE_NOT_REGISTERED
);
continue
;
}
}
}
}
}
}
}
}
...
@@ -7630,7 +7638,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -7630,7 +7638,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param
* @param
* @return {@link String}
* @return {@link String}
*/
*/
public
String
getSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
settleId
){
public
EkpSettleStatusVo
getSettleStatusFromEkpInsuranceDetail
(
String
detailId
,
String
settleId
){
String
id
=
detailId
+
CommonConstants
.
DOWN_LINE_STRING
+
settleId
;
String
id
=
detailId
+
CommonConstants
.
DOWN_LINE_STRING
+
settleId
;
//获取ekp结算信息
//获取ekp结算信息
return
ekpSettleService
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
return
ekpSettleService
.
getSettleStatusFromEkpInsuranceDetail
(
id
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
View file @
2452ffca
...
@@ -61,9 +61,9 @@
...
@@ -61,9 +61,9 @@
group by fd_3b0a5743acab7e
group by fd_3b0a5743acab7e
</select>
</select>
<select
id=
"getSettleStatusFromEkpInsuranceDetail"
resultType=
"
java.lang.String
"
>
<select
id=
"getSettleStatusFromEkpInsuranceDetail"
resultType=
"
com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSettleStatusVo
"
>
select
select
fd_3adfe6ec6a8cbe
fd_3adfe6ec6a8cbe
settleStatus,fd_3adfe6eda67236 payStatus
from
from
ekp_insurances_info
ekp_insurances_info
where
where
...
...
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