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
09c76273
Commit
09c76273
authored
Jan 28, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
fd189a67
1876321f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
9 deletions
+29
-9
ChecksUtil.java
...n/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
+20
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-6
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+1
-1
No files found.
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @
09c76273
...
...
@@ -298,6 +298,15 @@ public class ChecksUtil {
if
(
mobileList
.
size
()
>
CommonConstants
.
ZERO_INT
){
TCheckMobile
mobile
=
null
;
for
(
String
mb
:
mobileList
){
//广电号码放行,硬编码 后续要优化
if
(
mb
.
indexOf
(
"192"
)
==
0
){
mobile
=
new
TCheckMobile
();
mobile
.
setMobile
(
mb
);
mobile
.
setStatus
(
CommonConstants
.
ONE_STRING
);
mobile
.
setMessage
(
"广电号码放行"
);
checkMobileMap
.
put
(
mb
,
mobile
);
continue
;
}
jsonObject
=
ChecksUtil
.
invokeMobileBasic
(
mb
);
// 2.处理返回结果
if
(
jsonObject
!=
null
)
{
...
...
@@ -342,10 +351,19 @@ public class ChecksUtil {
}
}
else
{
// 记录错误日志,正式项目中请换成log打印
return
R
.
failed
(
"手机号校验失败:"
+
jsonObject
.
get
(
ChecksConstants
.
MESSAGE
).
getAsString
());
//return R.failed("手机号校验失败:" + jsonObject.get(ChecksConstants.MESSAGE).getAsString());
mobile
=
new
TCheckMobile
();
mobile
.
setMobile
(
mb
);
mobile
.
setStatus
(
CommonConstants
.
TEN_STRING
);
mobile
.
setMessage
(
getJsonElementValue
(
jsonObject
.
get
(
ChecksConstants
.
MESSAGE
))+
getJsonElementValue
(
jsonObject
.
get
(
ChecksConstants
.
REMARK
)));
checkMobileMap
.
put
(
mb
,
mobile
);
}
}
else
{
return
R
.
failed
(
ChecksConstants
.
NO_DATA_RESULT
);
mobile
=
new
TCheckMobile
();
mobile
.
setMobile
(
mb
);
mobile
.
setStatus
(
CommonConstants
.
TEN_STRING
);
mobile
.
setMessage
(
"调用第三方服务失败!"
);
checkMobileMap
.
put
(
mb
,
mobile
);
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
09c76273
...
...
@@ -1779,12 +1779,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
// 记录状态置为「退回」
detail
.
setBuyHandleStatus
(
CommonConstants
.
FOUR_INT
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
detail
.
getIsJfcd
())){
detail
.
setPaymentTime
(
CommonConstants
.
EMPTY_STRING
);
detail
.
setPaymentStatus
(
CommonConstants
.
ZERO_STRING
);
//添加日志
newDetail
.
setPaymentTime
(
CommonConstants
.
EMPTY_STRING
);
newDetail
.
setPaymentStatus
(
CommonConstants
.
ZERO_STRING
);
tBusinessOperateService
.
saveModificationRecord
(
detail
.
getId
(),
oldDetail
,
newDetail
,
"投保退回更新缴费状态、缴费时间"
,
user
.
getNickname
());
}
//投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空
if
(
detail
.
getSignFlag
()
==
CommonConstants
.
ONE_INT
){
detail
.
setHandledTime
(
null
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
09c76273
...
...
@@ -661,7 +661,7 @@ public class DoJointInsuranceTask {
}
if
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
.
equals
(
param
.
getSettleType
())){
//应收=实缴的应支-预估的应收
ys
=
BigDecimalUtils
.
s
afeSubtract
(
param
.
getActualPremium
(),
param
.
getEstimatePremium
()).
doubleValue
();
ys
=
BigDecimalUtils
.
s
ubtractAllowNegative
(
param
.
getActualPremium
(),
param
.
getEstimatePremium
()).
doubleValue
();
}
}
}
else
if
(
"0"
.
equals
(
param
.
getIsJfcd
())){
...
...
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