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
2bd69554
Commit
2bd69554
authored
Jun 18, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
见费出单优化
parent
d295e33b
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
47 deletions
+7
-47
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+4
-14
AdvancePaymentHelper.java
...ud/plus/v1/yifu/insurances/util/AdvancePaymentHelper.java
+0
-19
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+1
-0
application-dev.yml
...ifu-insurances-biz/src/main/resources/application-dev.yml
+1
-4
application-prd.yml
...ifu-insurances-biz/src/main/resources/application-prd.yml
+1
-4
application-test.yml
...fu-insurances-biz/src/main/resources/application-test.yml
+0
-2
application.yml
...es/yifu-insurances-biz/src/main/resources/application.yml
+0
-4
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 @
2bd69554
...
@@ -3928,7 +3928,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3928,7 +3928,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
CommonConstants
.
ZERO_STRING
.
equals
(
insuranceType
.
getIsJfcd
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
insuranceType
.
getIsJfcd
())
&&
CommonConstants
.
IS_FALSE
.
equals
(
settleDomainSelectVo
.
getBpoEnable
()))
{
CommonConstants
.
IS_FALSE
.
equals
(
settleDomainSelectVo
.
getBpoEnable
()))
{
param
.
setIsJfcd
(
CommonConstants
.
ZERO_STRING
);
param
.
setIsJfcd
(
CommonConstants
.
ZERO_STRING
);
param
.
setIsNewData
(
advancePaymentHelper
.
resolveIsNewDataForNewRecord
());
param
.
setIsNewData
(
InsurancesConstants
.
IS_NEW_DATA_YES
);
//上线后的数据都是新数据,历史数据有数据库更新
}
}
}
}
...
@@ -3942,7 +3942,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3942,7 +3942,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
CommonConstants
.
ZERO_STRING
.
equals
(
insuranceType
.
getIsJfcd
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
insuranceType
.
getIsJfcd
())
&&
CommonConstants
.
IS_FALSE
.
equals
(
settleDomainSelectVo
.
getBpoEnable
()))
{
CommonConstants
.
IS_FALSE
.
equals
(
settleDomainSelectVo
.
getBpoEnable
()))
{
param
.
setIsJfcd
(
CommonConstants
.
ZERO_STRING
);
param
.
setIsJfcd
(
CommonConstants
.
ZERO_STRING
);
param
.
setIsNewData
(
advancePaymentHelper
.
resolveIsNewDataForNewRecord
());
param
.
setIsNewData
(
InsurancesConstants
.
IS_NEW_DATA_YES
);
//上线后的数据都是新数据,历史数据有数据库更新
}
}
}
}
...
@@ -5146,12 +5146,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -5146,12 +5146,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param
.
setErrorMessage
(
InsurancesConstants
.
BUY_HANDLE_FOUR_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
BUY_HANDLE_FOUR_NOT_REGISTERED
);
continue
;
continue
;
}
}
if
(
!
advancePaymentHelper
.
isNewJfcdData
(
detail
)
&&
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
()){
settleStatus
=
getSettleStatusFromEkpInsuranceDetail
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
settleStatus
=
getSettleStatusFromEkpInsuranceDetail
(
detail
.
getId
(),
detail
.
getDefaultSettleId
());
if
(
null
!=
settleStatus
){
if
(
null
!=
settleStatus
){
if
(
Common
.
isNotNull
(
settleStatus
.
getSettleStatus
()))
{
if
(
!
advancePaymentHelper
.
isNewJfcdData
(
detail
)
&&
Common
.
isNotNull
(
settleStatus
.
getSettleStatus
()))
{
//保费更新或者保单号发票号更新
//保费更新或者保单号发票号更新
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getSettleStatus
()))
{
if
(
InsurancesConstants
.
SETTLE_TWO
.
equals
(
settleStatus
.
getSettleStatus
()))
{
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
param
.
setErrorMessage
(
InsurancesConstants
.
SETTLE_HANDLE_THREE_NOT_REGISTERED
);
...
@@ -9506,16 +9506,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -9506,16 +9506,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
Common
.
isEmpty
(
vo
))
{
if
(
Common
.
isEmpty
(
vo
))
{
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getDetailIds
()))
{
List
<
String
>
detailIds
=
Arrays
.
asList
(
vo
.
getDetailIds
().
split
(
CommonConstants
.
COMMA_STRING
));
boolean
allNewAdvancePay
=
detailIds
.
stream
().
allMatch
(
id
->
{
TInsuranceDetail
detail
=
baseMapper
.
selectById
(
id
);
return
detail
!=
null
&&
advancePaymentHelper
.
isNewJfcdData
(
detail
);
});
if
(
allNewAdvancePay
)
{
return
R
.
ok
();
}
}
try
{
try
{
log
.
info
(
"商险状态更新报文"
+
JSON
.
toJSONString
(
vo
));
log
.
info
(
"商险状态更新报文"
+
JSON
.
toJSONString
(
vo
));
doJointInsuranceTask
.
updateInsuranceSettleStatus
(
vo
);
doJointInsuranceTask
.
updateInsuranceSettleStatus
(
vo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/AdvancePaymentHelper.java
View file @
2bd69554
...
@@ -17,10 +17,6 @@ import java.time.format.DateTimeFormatter;
...
@@ -17,10 +17,6 @@ import java.time.format.DateTimeFormatter;
@Component
@Component
public
class
AdvancePaymentHelper
{
public
class
AdvancePaymentHelper
{
private
static
final
DateTimeFormatter
LAUNCH_TIME_FORMAT
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
@Value
(
"${advance-pay.new-data-launch-time:2099-12-31 23:59:59}"
)
private
String
newDataLaunchTime
;
public
boolean
isJfcd
(
TInsuranceDetail
detail
)
{
public
boolean
isJfcd
(
TInsuranceDetail
detail
)
{
return
detail
!=
null
&&
CommonConstants
.
ZERO_STRING
.
equals
(
detail
.
getIsJfcd
());
return
detail
!=
null
&&
CommonConstants
.
ZERO_STRING
.
equals
(
detail
.
getIsJfcd
());
...
@@ -55,21 +51,6 @@ public class AdvancePaymentHelper {
...
@@ -55,21 +51,6 @@ public class AdvancePaymentHelper {
&&
InsurancesConstants
.
IS_NEW_DATA_YES
.
equals
(
param
.
getIsNewData
());
&&
InsurancesConstants
.
IS_NEW_DATA_YES
.
equals
(
param
.
getIsNewData
());
}
}
/**
* 满足见费出单条件时,按发布时间决定是否新数据。
*/
public
String
resolveIsNewDataForNewRecord
()
{
try
{
LocalDateTime
launch
=
LocalDateTime
.
parse
(
newDataLaunchTime
.
trim
(),
LAUNCH_TIME_FORMAT
);
if
(!
LocalDateTime
.
now
().
isBefore
(
launch
))
{
return
InsurancesConstants
.
IS_NEW_DATA_YES
;
}
}
catch
(
Exception
ignored
)
{
// 配置解析失败时保守走历史逻辑
}
return
InsurancesConstants
.
IS_NEW_DATA_NO
;
}
/** HRO is_new_data 与 EKP fd_new_data 同值直传 */
/** HRO is_new_data 与 EKP fd_new_data 同值直传 */
public
String
toEkpFdNewData
(
String
isNewData
)
{
public
String
toEkpFdNewData
(
String
isNewData
)
{
if
(
InsurancesConstants
.
IS_NEW_DATA_YES
.
equals
(
isNewData
))
{
if
(
InsurancesConstants
.
IS_NEW_DATA_YES
.
equals
(
isNewData
))
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
2bd69554
...
@@ -251,6 +251,7 @@ public class DoJointInsuranceTask {
...
@@ -251,6 +251,7 @@ public class DoJointInsuranceTask {
if
(
Common
.
isNotNull
(
viewVo
.
getId
()))
{
if
(
Common
.
isNotNull
(
viewVo
.
getId
()))
{
insuranceId
=
viewVo
.
getId
().
substring
(
0
,
19
);
insuranceId
=
viewVo
.
getId
().
substring
(
0
,
19
);
detail
=
insuranceDetailMapper
.
selectById
(
insuranceId
);
detail
=
insuranceDetailMapper
.
selectById
(
insuranceId
);
//(历史见费出单数据走这里,新见费出单不走这里)
if
(
Common
.
isNotNull
(
detail
)
&&
advancePaymentHelper
.
isNewJfcdData
(
detail
))
{
if
(
Common
.
isNotNull
(
detail
)
&&
advancePaymentHelper
.
isNewJfcdData
(
detail
))
{
continue
;
continue
;
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/application-dev.yml
View file @
2bd69554
...
@@ -42,6 +42,3 @@ wx:
...
@@ -42,6 +42,3 @@ wx:
agentid
:
1000010
agentid
:
1000010
authUrl
:
https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
authUrl
:
https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName
:
https://test-wx.worfu.com
domainName
:
https://test-wx.worfu.com
advance-pay
:
new-data-launch-time
:
2099-12-31 23:59:59
\ No newline at end of file
yifu-insurances/yifu-insurances-biz/src/main/resources/application-prd.yml
View file @
2bd69554
...
@@ -42,6 +42,3 @@ wx:
...
@@ -42,6 +42,3 @@ wx:
agentid
:
1000009
agentid
:
1000009
authUrl
:
https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
authUrl
:
https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName
:
https://wx.worfu.com
domainName
:
https://wx.worfu.com
advance-pay
:
new-data-launch-time
:
2099-12-31 23:59:59
\ No newline at end of file
yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml
View file @
2bd69554
...
@@ -44,5 +44,3 @@ wx:
...
@@ -44,5 +44,3 @@ wx:
domainName
:
https://test-wx.worfu.com
domainName
:
https://test-wx.worfu.com
advance-pay
:
new-data-launch-time
:
2099-12-31 23:59:59
yifu-insurances/yifu-insurances-biz/src/main/resources/application.yml
View file @
2bd69554
...
@@ -104,7 +104,3 @@ springdoc:
...
@@ -104,7 +104,3 @@ springdoc:
-
group
:
insurances
-
group
:
insurances
#按包路径匹配
#按包路径匹配
packagesToScan
:
com.yifu.cloud.plus.v1.yifu.insurances.controller
packagesToScan
:
com.yifu.cloud.plus.v1.yifu.insurances.controller
# 新提前缴费数据写入切点(满足见费出单且当前时间>=此时间时写 isNewData=1)
advance-pay
:
new-data-launch-time
:
2099-12-31 23:59:59
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