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
dc64c3eb
Commit
dc64c3eb
authored
Jan 08, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.7.4' into develop
parents
1cb37c92
cabe3f67
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
350 additions
and
105 deletions
+350
-105
EkpBankCodeSet.java
...ava/com/yifu/cloud/plus/v1/ekp/entity/EkpBankCodeSet.java
+1
-1
EkpBankGrantDetailMapper.java
...fu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
+5
-0
EkpBankGrantDetailService.java
.../cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
+19
-0
EkpBankGrantDetailServiceImpl.java
...us/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
+11
-0
IcbcTransactionFlowIssueServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
+3
-0
EkpBankGrantDetailMapper.xml
...iz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
+9
-0
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
+174
-87
EkpSettleMapper.xml
...ces-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml
+29
-0
TSalaryAccountPhoneController.java
...yifu/salary/controller/TSalaryAccountPhoneController.java
+1
-1
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+2
-2
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+1
-1
application-test.yml
...l/yifu-social-biz/src/main/resources/application-test.yml
+1
-1
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+2
-2
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+4
-10
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/entity/EkpBankCodeSet.java
View file @
dc64c3eb
...
...
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotBlank;
import
java.time.LocalDateTime
;
/**
* 银企付款查询卡号所属行号记录表
* 银企付款查询卡号所属行号记录表
——有可能重复
*
* @author hgw
* @date 2024-11-18 17:04:20
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/mapper/EkpBankGrantDetailMapper.java
View file @
dc64c3eb
...
...
@@ -73,4 +73,9 @@ public interface EkpBankGrantDetailMapper extends BaseMapper<EkpBankGrantDetail>
**/
List
<
EkpBankCodeConfiglVo
>
getEkpBankCodeConfiglVo
();
// 更新工资支出的 银企出纳
void
updateGongZiZhiChuTable
(
@Param
(
"fdId"
)
String
fdId
,
@Param
(
"chuNaName"
)
String
chuNaName
);
// 更新工资支出Main表的 银企出纳
void
updateGongZiZhiChuMain
(
@Param
(
"fdId"
)
String
fdId
,
@Param
(
"chuNaName"
)
String
chuNaName
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpBankGrantDetailService.java
View file @
dc64c3eb
...
...
@@ -66,4 +66,23 @@ public interface EkpBankGrantDetailService extends IService<EkpBankGrantDetail>
// 获取工行开户行配置表
Map
<
String
,
EkpBankCodeConfiglVo
>
getEkpBankCodeConfiglVo
();
/**
* @param fdId 工资支出 表id
* @param chuNaName 银企出纳名字
* @Description: 更新 工资支出 的 银企出纳名字
* @Author: hgw
* @Date: 2024/12/26 11:41
* @return: void
**/
void
updateGongZiZhiChuTable
(
String
fdId
,
String
chuNaName
);
/**
* @param fdId 工资支出 表id
* @param chuNaName 银企出纳名字
* @Description: 更新 工资支出Main表 的 银企出纳名字
* @Author: hgw
* @Date: 2024/12/26 11:41
* @return: void
**/
void
updateGongZiZhiChuMain
(
String
fdId
,
String
chuNaName
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpBankGrantDetailServiceImpl.java
View file @
dc64c3eb
...
...
@@ -118,4 +118,15 @@ public class EkpBankGrantDetailServiceImpl extends ServiceImpl<EkpBankGrantDetai
return
returnMap
;
}
@Override
public
void
updateGongZiZhiChuTable
(
String
fdId
,
String
chuNaName
)
{
baseMapper
.
updateGongZiZhiChuTable
(
fdId
,
chuNaName
);
}
@Override
public
void
updateGongZiZhiChuMain
(
String
fdId
,
String
chuNaName
)
{
baseMapper
.
updateGongZiZhiChuMain
(
fdId
,
chuNaName
);
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowIssueServiceImpl.java
View file @
dc64c3eb
...
...
@@ -730,6 +730,9 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
ekpBankPayTaskService
.
updateById
(
main
);
// 同步更新明细的发放时间、发放状态
ekpBankGrantDetailService
.
updateStatusByGrant
(
fdId
);
// 更新 工资支出 的 银企出纳名字
ekpBankGrantDetailService
.
updateGongZiZhiChuTable
(
fdId
,
submitUser
);
ekpBankGrantDetailService
.
updateGongZiZhiChuMain
(
fdId
,
submitUser
);
}
redisUtil
.
remove
(
redisKey
);
return
returnR
;
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpBankGrantDetailMapper.xml
View file @
dc64c3eb
...
...
@@ -189,4 +189,13 @@
where a.bank_name_mvp is not null and a.bank_name_mvp != ''
</select>
<!-- 更新工资支出 的 银企出纳 -->
<update
id=
"updateGongZiZhiChuTable"
>
UPDATE ekp_fd9be224c214ad0992aa SET fd_bank_pay_chu_na = #{chuNaName} WHERE fd_id = #{fdId};
</update>
<!-- 更新工资支出Main表的 银企出纳 -->
<update
id=
"updateGongZiZhiChuMain"
>
UPDATE modeling_model_main SET extend_data_xml=JSON_SET(extend_data_xml,'$[1].fd_bank_pay_chu_na',#{chuNaName}) WHERE fd_id = #{fdId};
</update>
</mapper>
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @
dc64c3eb
...
...
@@ -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 @
dc64c3eb
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 @
dc64c3eb
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 @
dc64c3eb
...
...
@@ -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 @
dc64c3eb
...
...
@@ -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 @
dc64c3eb
...
...
@@ -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 @
dc64c3eb
...
...
@@ -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,78 +5768,80 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//如果没有登记保费
if
(
BigDecimalUtils
.
isNullOrZero
(
actualPremium
)){
if
(
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
interactiveParam
.
setCustomerCode
(
success
.
getOldCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getOldCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getOldDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getOldDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
ABOLISH_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
one
.
getEstimatePremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
String
deleteBody
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
if
(
StringUtils
.
isNotBlank
(
deleteBody
)){
//推送成功后更新作废信息推送状态
cancel
.
setIsCancelPush
(
CommonConstants
.
ONE_INT
);
tInsuranceSettleCancelService
.
updateById
(
cancel
);
//变更为单独结算
if
(
CommonConstants
.
ONE_INT
==
newSettleType
){
//删除预估费用和结算id
updateWrapper
.
set
(
TInsuranceDetail
::
getEstimatePremium
,
new
BigDecimal
(
"0.00"
));
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
null
);
update
(
updateWrapper
);
}
//变更为合并结算
if
(
CommonConstants
.
ZERO_INT
==
newSettleType
){
//新增新的结算信息
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
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
//更新结算信息
updateWrapper
.
set
(
TInsuranceDetail
::
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//推送新的结算信息至EKP
interactiveParam
.
setDefaultSettleId
(
newInsuranceSettle
.
getId
());
interactiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
interactiveParam
.
setCustomerCode
(
success
.
getNewCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getNewCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getNewDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getNewDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
String
estimateBody
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
if
(
StringUtils
.
isNotBlank
(
estimateBody
)){
//推送成功更新预估推送状态
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ONE_INT
);
newInsuranceSettle
.
setEstimatePushTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
newInsuranceSettle
);
}
else
{
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
ONE_INT
);
if
(
byId
.
getIsEstimatePush
()
==
CommonConstants
.
ONE_INT
){
if
(
ygFlag
)
{
interactiveParam
.
setCustomerCode
(
success
.
getOldCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getOldCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getOldDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getOldDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
ABOLISH_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
one
.
getEstimatePremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
String
deleteBody
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
if
(
StringUtils
.
isNotBlank
(
deleteBody
))
{
//推送成功后更新作废信息推送状态
cancel
.
setIsCancelPush
(
CommonConstants
.
ONE_INT
);
tInsuranceSettleCancelService
.
updateById
(
cancel
);
//变更为单独结算
if
(
CommonConstants
.
ONE_INT
==
newSettleType
)
{
//删除预估费用和结算id
updateWrapper
.
set
(
TInsuranceDetail:
:
getEstimatePremium
,
new
BigDecimal
(
"0.00"
));
updateWrapper
.
set
(
TInsuranceDetail:
:
getDefaultSettleId
,
null
);
update
(
updateWrapper
);
}
//变更为合并结算
if
(
CommonConstants
.
ZERO_INT
==
newSettleType
)
{
//新增新的结算信息
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
.
setEstimatePremium
(
success
.
getEstimatePremium
());
tInsuranceSettleService
.
save
(
newInsuranceSettle
);
//更新结算信息
updateWrapper
.
set
(
TInsuranceDetail:
:
getDefaultSettleId
,
newInsuranceSettle
.
getId
());
update
(
updateWrapper
);
//推送新的结算信息至EKP
interactiveParam
.
setDefaultSettleId
(
newInsuranceSettle
.
getId
());
interactiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
interactiveParam
.
setCustomerCode
(
success
.
getNewCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getNewCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getNewDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getNewDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
String
estimateBody
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
if
(
StringUtils
.
isNotBlank
(
estimateBody
))
{
//推送成功更新预估推送状态
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ONE_INT
);
newInsuranceSettle
.
setEstimatePushTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
newInsuranceSettle
);
}
else
{
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
ONE_INT
);
}
}
}
else
{
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
FOUR_INT
);
//变更为合并结算
if
(
CommonConstants
.
ZERO_INT
==
newSettleType
)
{
//推送新的结算信息至EKP
interactiveParam
.
setDefaultSettleId
(
newInsuranceSettle
.
getId
());
interactiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
interactiveParam
.
setCustomerCode
(
success
.
getNewCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getNewCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getNewDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getNewDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
ONE_INT
);
}
}
}
else
{
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
FOUR_INT
);
//变更为合并结算
if
(
CommonConstants
.
ZERO_INT
==
newSettleType
){
//推送新的结算信息至EKP
interactiveParam
.
setDefaultSettleId
(
newInsuranceSettle
.
getId
());
interactiveParam
.
setEstimateStatus
(
EkpConstants
.
HAVE
);
interactiveParam
.
setCustomerCode
(
success
.
getNewCustomerCode
());
interactiveParam
.
setCustomerName
(
success
.
getNewCustomerName
());
interactiveParam
.
setDeptNo
(
success
.
getNewDeptNo
());
interactiveParam
.
setDeptName
(
success
.
getNewDeptName
());
interactiveParam
.
setInteractiveType
(
InsurancesConstants
.
NEW_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
ONE_INT
);
}
}
}
else
{
...
...
@@ -6965,8 +7013,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 +7460,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 @
dc64c3eb
...
...
@@ -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
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountPhoneController.java
View file @
dc64c3eb
...
...
@@ -65,7 +65,7 @@ public class TSalaryAccountPhoneController {
**/
@Operation
(
description
=
"获取工资报账信息"
)
@GetMapping
(
"/getSalaryAccount"
)
public
R
<
AccountForWxVo
>
getSalaryAccount
(
@RequestParam
String
idNumber
,
String
year
,
String
openId
)
{
public
R
<
AccountForWxVo
>
getSalaryAccount
(
@RequestParam
(
required
=
false
)
String
idNumber
,
String
year
,
String
openId
)
{
if
(
Common
.
isEmpty
(
idNumber
)
||
Common
.
isEmpty
(
openId
)){
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
dc64c3eb
...
...
@@ -428,7 +428,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
}
if
(
dataRowFlag
)
{
if
(
idCardNum
!=
-
1
)
{
if
(
idCardNum
!=
null
&&
idCardNum
!=
-
1
)
{
return
R
.
failed
(
"您配置的身份证列第【"
+(
idCardNum
+
1
)+
"】列未找到身份证,请确认表头配置或表格数据!!"
);
}
return
R
.
failed
(
"未找到身份证所在的数据行,请检查表数据!!"
);
...
...
@@ -713,7 +713,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
}
if
(
dataRowFlag
)
{
if
(
idCardNum
!=
-
1
)
{
if
(
idCardNum
!=
null
&&
idCardNum
!=
-
1
)
{
return
R
.
failed
(
"您配置的身份证列第【"
+(
idCardNum
+
1
)+
"】列未找到身份证,请确认表头配置或表格数据!!"
);
}
return
R
.
failed
(
"未找到身份证所在的数据行,请检查表数据!!"
);
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
dc64c3eb
...
...
@@ -32,7 +32,7 @@ spring:
type
:
CLASS_BASED
tables
:
t_payment_info
:
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
4
}
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
5
}
key-generate-strategy
:
column
:
ID
key-generator-name
:
snowflake
...
...
yifu-social/yifu-social-biz/src/main/resources/application-test.yml
View file @
dc64c3eb
...
...
@@ -32,7 +32,7 @@ spring:
type
:
CLASS_BASED
tables
:
t_payment_info
:
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
4
}
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
5
}
key-generate-strategy
:
column
:
ID
key-generator-name
:
snowflake
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
dc64c3eb
...
...
@@ -206,9 +206,9 @@
a.UNIT_CREDIT_CODE unitCreditCode,
a.CUSTOMER_NO_YSD customerNoYsd,
a.SOCIAL_ACCOUNT socialAccount,
a.SOCIAL_PASSWORD
socialPassword,
""
socialPassword,
a.MEDICL_ACCOUNT mediclAccount,
a.MEDICL_PASSWORD
mediclPassword,
""
mediclPassword,
if(a.IS_SIGN = '0','是','否') isSign,
if(a.AUTO_STATUS = '0','启用','禁用') autoStatus
FROM sys_house_hold_info a
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
dc64c3eb
...
...
@@ -913,9 +913,6 @@
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if>
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if>
<if
test=
"tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"
>
AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
</if>
...
...
@@ -1112,9 +1109,6 @@
<if
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"
>
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
</if>
<if
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
</if>
<!-- 区域 默认精准查询 0 包含下级查询 1 开始 2023-03-02 fxj -->
<if
test=
'tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'
>
<if
test=
"tPaymentInfo.socialTown == null"
>
...
...
@@ -1743,7 +1737,7 @@
w.PERSONAL_PROVIDENT_PERCENT
FROM (
(SELECT
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH
, '_', a.SETTLE_DOMAIN_CODE
) AS keyGroup,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_NAME,
...
...
@@ -1803,11 +1797,11 @@
IFNULL(a.SOCIAL_ID,'1') != '1'
<include
refid=
"tPaymentInfo_export_social_where"
/>
</where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH
,a.SETTLE_DOMAIN_CODE
)
union all
(SELECT
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup,
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH
, '_', a.SETTLE_DOMAIN_CODE
) AS keyGroup,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_NAME,
...
...
@@ -1867,7 +1861,7 @@
IFNULL(a.FUND_ID,'1') != '1'
<include
refid=
"tPaymentInfo_export_fund_where"
/>
</where>
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH
,a.SETTLE_DOMAIN_CODE
)
) w
GROUP BY w.keyGroup) k
...
...
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