Commit 2452ffca authored by hongguangwu's avatar hongguangwu

MVP1.7.14-商险已支出,无法登记保单保费

parent a166fe9f
...@@ -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 = "商险已支出,无法登记保单保费";
/** /**
* 保单号不存在或已过期 * 保单号不存在或已过期
*/ */
......
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;
}
...@@ -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);
......
...@@ -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);
/** /**
* 根据结算单编号查询商险视图信息 * 根据结算单编号查询商险视图信息
......
...@@ -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);
} }
......
...@@ -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,15 +4053,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4052,15 +4053,22 @@ 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)) { //保费更新或者保单号发票号更新
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED); if (InsurancesConstants.SETTLE_TWO.equals(settleStatus.getSettleStatus())) {
continue; param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleStatus.getSettleStatus())) {
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
continue;
}
} }
if (InsurancesConstants.SETTLE_ONE.equals(status)) { // 商险已支出,无法登记保单保费
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED); if(Common.isNotNull(settleStatus.getPayStatus()) && InsurancesConstants.SETTLE_TWO.equals(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_NOT_REGISTERED);
continue; 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);
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment