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
3592ec54
Commit
3592ec54
authored
Aug 31, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:修改商险ekp的配置类"
parent
68b88972
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
78 additions
and
53 deletions
+78
-53
EkpInsuranceUtil.java
...om/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java
+2
-2
EKPInsurancePushParam.java
...yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
+2
-2
spring.factories
...u-common-ekp/src/main/resources/META-INF/spring.factories
+1
-1
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+25
-0
EkpInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
+2
-2
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+41
-41
TInsuranceEkpServiceImpl.java
...nces/service/insurance/impl/TInsuranceEkpServiceImpl.java
+5
-5
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java
View file @
3592ec54
...
@@ -105,7 +105,7 @@ public class EkpInsuranceUtil {
...
@@ -105,7 +105,7 @@ public class EkpInsuranceUtil {
if
(
null
!=
param
.
getSettleType
()){
if
(
null
!=
param
.
getSettleType
()){
pushParam
.
setFd_3adfe6af71a1cc
(
param
.
getSettleType
());
pushParam
.
setFd_3adfe6af71a1cc
(
param
.
getSettleType
());
}
else
{
}
else
{
pushParam
.
setFd_3adfe6af71a1cc
(
CommonConstants
.
ZERO_INT
);
pushParam
.
setFd_3adfe6af71a1cc
(
CommonConstants
.
EMPTY_STRING
);
}
}
//项目编码
//项目编码
pushParam
.
setFd_3adfe658c6229e
(
param
.
getDeptNo
());
pushParam
.
setFd_3adfe658c6229e
(
param
.
getDeptNo
());
...
@@ -229,7 +229,7 @@ public class EkpInsuranceUtil {
...
@@ -229,7 +229,7 @@ public class EkpInsuranceUtil {
if
(
null
!=
param
.
getInteractiveType
()){
if
(
null
!=
param
.
getInteractiveType
()){
pushParam
.
setFd_3af9197b31071c
(
param
.
getInteractiveType
());
pushParam
.
setFd_3af9197b31071c
(
param
.
getInteractiveType
());
}
else
{
}
else
{
pushParam
.
setFd_3af9197b31071c
(
CommonConstants
.
ZERO_INT
);
pushParam
.
setFd_3af9197b31071c
(
CommonConstants
.
EMPTY_STRING
);
}
}
//有无预估
//有无预估
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java
View file @
3592ec54
...
@@ -13,12 +13,12 @@ public class EKPInsurancePushParam {
...
@@ -13,12 +13,12 @@ public class EKPInsurancePushParam {
/**
/**
* 单据类型 200 单选(1,预估单,2,实缴单,3,差异单)
* 单据类型 200 单选(1,预估单,2,实缴单,3,差异单)
*/
*/
private
Integer
fd_3adfe6af71a1cc
;
private
String
fd_3adfe6af71a1cc
;
/**
/**
* 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
* 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
*/
*/
private
Integer
fd_3af9197b31071c
;
private
String
fd_3af9197b31071c
;
/**
/**
* 项目编码 200
* 项目编码 200
...
...
yifu-common/yifu-common-ekp/src/main/resources/META-INF/spring.factories
View file @
3592ec54
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.ekp.util.E
KP
InsuranceUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.E
kp
InsuranceUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
3592ec54
...
@@ -1025,6 +1025,31 @@ public class InsurancesConstants {
...
@@ -1025,6 +1025,31 @@ public class InsurancesConstants {
public
static
final
String
BUY_TYPE_ERROR
=
"购买类型错误"
;
public
static
final
String
BUY_TYPE_ERROR
=
"购买类型错误"
;
/**
* 预估单
*/
public
static
final
String
ESTIMATE_SETTLE_BILL
=
"预估单"
;
/**
* 实缴单
*/
public
static
final
String
ACTUAL_SETTLE_BILL
=
"实缴单"
;
/**
* 新增结算单
*/
public
static
final
String
NEW_SETTLE_BILL
=
"新增结算单"
;
/**
* 结算中
*/
public
static
final
String
UPDATE_SETTLE_BILL
=
"更新结算单信息"
;
/**
* 结算中
*/
public
static
final
String
ABOLISH_SETTLE_BILL
=
"作废结算单信息"
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java
View file @
3592ec54
...
@@ -43,7 +43,7 @@ public class EkpInteractiveParam implements Serializable {
...
@@ -43,7 +43,7 @@ public class EkpInteractiveParam implements Serializable {
* 单据类型 (0、与薪资合并结算 1、单独结算)
* 单据类型 (0、与薪资合并结算 1、单独结算)
*/
*/
@Schema
(
description
=
"单据类型 (1、预估单 2、实缴单)"
)
@Schema
(
description
=
"单据类型 (1、预估单 2、实缴单)"
)
private
Integer
settleType
;
private
String
settleType
;
/**
/**
* 项目编码
* 项目编码
...
@@ -163,7 +163,7 @@ public class EkpInteractiveParam implements Serializable {
...
@@ -163,7 +163,7 @@ public class EkpInteractiveParam implements Serializable {
* 单据状态
* 单据状态
*/
*/
@Schema
(
description
=
"状态:1新增结算单,2更新结算单信息,3作废结算单信息"
)
@Schema
(
description
=
"状态:1新增结算单,2更新结算单信息,3作废结算单信息"
)
private
Integer
interactiveType
;
private
String
interactiveType
;
/**
/**
* EKP推送类型
* EKP推送类型
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
3592ec54
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java
View file @
3592ec54
...
@@ -41,7 +41,7 @@ import java.util.List;
...
@@ -41,7 +41,7 @@ import java.util.List;
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
public
class
TInsuranceEkpServiceImpl
extends
ServiceImpl
<
TInsuranceEkpMapper
,
TInsuranceEkp
>
implements
TInsuranceEkpService
{
@Resource
@Resource
EkpInsuranceUtil
e
KP
InsuranceUtil
;
EkpInsuranceUtil
e
kp
InsuranceUtil
;
@Resource
@Resource
TInsuranceSettleService
tInsuranceSettleService
;
TInsuranceSettleService
tInsuranceSettleService
;
...
@@ -86,7 +86,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -86,7 +86,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
EkpInteractiveParam
ekpParam
=
new
EkpInteractiveParam
();
EkpInteractiveParam
ekpParam
=
new
EkpInteractiveParam
();
BeanCopyUtils
.
copyProperties
(
tInsuranceEkp
,
ekpParam
);
BeanCopyUtils
.
copyProperties
(
tInsuranceEkp
,
ekpParam
);
if
(
actualStatus
.
equals
(
InsurancesConstants
.
SETTLE_ZERO
)){
if
(
actualStatus
.
equals
(
InsurancesConstants
.
SETTLE_ZERO
)){
String
s
=
e
KP
InsuranceUtil
.
sendToEkp
(
ekpParam
);
String
s
=
e
kp
InsuranceUtil
.
sendToEkp
(
ekpParam
);
//如果发送成功
//如果发送成功
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
//预估则更新预估保费
//预估则更新预估保费
...
@@ -132,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -132,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
if
(!
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
ekpParam
.
setActualPremium
(
actualPremium
.
negate
());
}
}
ekpParam
.
setInteractiveType
(
CommonConstants
.
ONE_INT
);
ekpParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
String
s
=
e
KP
InsuranceUtil
.
sendToEkp
(
ekpParam
);
String
s
=
e
kp
InsuranceUtil
.
sendToEkp
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
successLit
.
add
(
tInsuranceEkp
);
successLit
.
add
(
tInsuranceEkp
);
...
@@ -142,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
...
@@ -142,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
}
//如果为红冲数据则正常发送
//如果为红冲数据则正常发送
}
else
if
(
CommonConstants
.
FIVE_INT
==
pushType
||
CommonConstants
.
SIX_INT
==
pushType
){
}
else
if
(
CommonConstants
.
FIVE_INT
==
pushType
||
CommonConstants
.
SIX_INT
==
pushType
){
String
s
=
e
KP
InsuranceUtil
.
sendToEkp
(
ekpParam
);
String
s
=
e
kp
InsuranceUtil
.
sendToEkp
(
ekpParam
);
if
(
StringUtils
.
isNotBlank
(
s
)){
if
(
StringUtils
.
isNotBlank
(
s
)){
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
tInsuranceEkp
.
setResendFlag
(
CommonConstants
.
ONE_INT
);
successLit
.
add
(
tInsuranceEkp
);
successLit
.
add
(
tInsuranceEkp
);
...
...
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