Commit 9b9d1754 authored by huyuchen's avatar huyuchen

huych-商险接口推送优化

parent b4e4016f
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 商险订单明细表
*
* @author huych
* @date 2025-02-07 15:17:24
*/
@Data
@TableName("ekp_insurances_info")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商险订单明细表")
public class EkpInsurancesInfo extends BaseEntity {
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "fd_Id")
private String fd_id;
@Schema(description = "单据类型")
private String fd_3adfe6af71a1cc;
@Schema(description = "fd_3adfe658c6229e")
private String fd_3adfe658c6229e;
@Schema(description = "fd_3adfe6592b4158")
private String fd_3adfe6592b4158;
@Schema(description = "单号")
private String fd_3adfe67a9f6364;
@Schema(description = "fd_3adfe6598281e8")
private String fd_3adfe6598281e8;
@Schema(description = "fd_3adfe7a2688902")
private String fd_3adfe7a2688902;
@Schema(description = "fd_3adfe67c24dace")
private Date fd_3adfe67c24dace;
@Schema(description = "fd_3adfe65d759650")
private String fd_3adfe65d759650;
@Schema(description = "fd_3adfe65dbd9f68")
private String fd_3adfe65dbd9f68;
@Schema(description = "发票号")
private String fd_3adfe65e0cd094;
@Schema(description = "险种")
private String fd_3adfe65f6599e4;
@Schema(description = "保险公司")
private String fd_3adfe65ea04728;
@Schema(description = "保单号")
private String fd_3adfe65e60e110;
@Schema(description = "保险开始日期")
private Date fd_3adfe6b7e0ede8;
@Schema(description = "保险结束日期")
private Date fd_3adfe6b847bfe6;
@Schema(description = "购买标准")
private Double fd_3adfe6d55384c6;
@Schema(description = "实际保费")
private Double fd_3adfe6610c0d2c;
@Schema(description = "fd_3adfe66041a996")
private Double fd_3adfe66041a996;
@Schema(description = "事故或残疾")
private String fd_3adfe6609aa810;
@Schema(description = "应收")
private Double fd_3adfe6e30f2a3c;
@Schema(description = "结算状态")
private String fd_3adfe6ec6a8cbe;
@Schema(description = "收款状态")
private String fd_3adfe6ef5dfaac;
@Schema(description = "fd_3adfe79fd_04606")
private String fd_3adfe79fd04606;
@Schema(description = "fd_3adfe7a117f086")
private String fd_3adfe7a117f086;
@Schema(description = "应支出")
private Double fd_3adfe6e3911ffe;
@Schema(description = "支出结算状态")
private String fd_3adfe6eda67236;
@Schema(description = "付款状态")
private String fd_3adfe6f05531ec;
@Schema(description = "fd_3adfe7a035849c")
private String fd_3adfe7a035849c;
@Schema(description = "fd_3adfe7a08eba96")
private String fd_3adfe7a08eba96;
@Schema(description = "状态")
private String fd_3af9197b31071c;
@Schema(description = "实际结算月份")
private Date fd_3af9d11088facc;
@Schema(description = "有无预估")
private String fd_3af9d1441ef7b6;
@Schema(description = "预估金额")
private Double fd_3af9d15f7018fa;
@Schema(description = "fd_3af9d1662141a4")
private Double fd_3af9d1662141a4;
@Schema(description = "商险ID")
private String fd_3b0a5743acab7e;
@Schema(description = "fd_3b13ad2da5d476")
private String fd_3b13ad2da5d476;
@Schema(description = "fd_3b13ad3948940c")
private Date fd_3b13ad3948940c;
@Schema(description = "HRO结算月")
private Date fd_3b13b3076af5a0;
@Schema(description = "是否全部结算")
private String fd_3b13b2ecc164aa;
@Schema(description = "fd_3b16da0eb23648")
private String fd_3b16da0eb23648;
@Schema(description = "项目编码")
private String fd_3b16dfb32778f2_text;
@Schema(description = "项目台账ID(ID)")
private String fd_3b16dfb32778f2;
@Schema(description = "是否为BPO业务")
private String fd_3b178fab62d196;
@Schema(description = "变更记录")
private String fd_3b3e4653122c9e;
@Schema(description = "商险变更记录")
private String fd_3b5bf1628c5a68;
@Schema(description = "变更发票号")
private String fd_3b5bf17f2fc25c;
@Schema(description = "变更购买标准")
private String fd_3b5bf180e08fbe;
@Schema(description = "保单开始时间")
private Date fd_3b5bf17ae91f9c;
@Schema(description = "保单结束时间")
private Date fd_3b5bf17c6df310;
@Schema(description = "投保类型")
private String fd_3b5bf17d9297c2;
@Schema(description = "商险封面抬头")
private String fd_3b941cbcea3e1a;
@Schema(description = "fd_3c6f0108e05c84")
private String fd_3c6f0108e05c84;
@Schema(description = "是否启用BPO结算模式")
private String fd_usebpo_settle;
@Schema(description = "创建时间")
private Date createTime;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import lombok.Data;
import java.io.Serializable;
/**
* @Author huyc
* @Date 2025/2/7
* @Description 获取项目明细信息
* @Version 1.0
*/
@Data
public class EkpInsuranceDeptInfoVo implements Serializable {
/**
* fdId
**/
private String fdId;
/**
* 是否为BPO项目
**/
private String isBpo;
/**
* 商险费用
**/
private String insurancesType;
/**
* 结算方式
**/
private String settleType;
/**
* 商险封面抬头
**/
private String insurancesTitle;
/**
* 是否启用BPO结算模式
**/
private String bpoSettle;
/**
* 项目编码
**/
private String deptNo;
}
package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.EkpInsurancesInfo;
import org.apache.ibatis.annotations.Mapper;
/**
* 商险订单明细表
*
* @author huych
* @date 2025-02-07 15:17:24
*/
@Mapper
public interface EkpInsurancesInfoMapper extends BaseMapper<EkpInsurancesInfo> {
}
package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp; 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.*;
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;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -64,4 +61,6 @@ public interface EkpSettleMapper { ...@@ -64,4 +61,6 @@ public interface EkpSettleMapper {
List<EkpSocialViewVo> selectSalarylViewBySettleNo(@Param("settleNo") String settleNo,@Param("payFlag") String payFlag); List<EkpSocialViewVo> selectSalarylViewBySettleNo(@Param("settleNo") String settleNo,@Param("payFlag") String payFlag);
EkpInsuranceDeptInfoVo getInsuranceEkpDeptInfo(@Param("deptNo") String deptNo);
} }
package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.EkpInsurancesInfo;
/**
* 商险订单明细表
*
* @author huych
* @date 2025-02-07 15:17:24
*/
public interface EkpInsurancesInfoService extends IService<EkpInsurancesInfo> {
}
...@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp; ...@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
import com.baomidou.mybatisplus.extension.service.IService; 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.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate; 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.*;
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;
import java.util.List; import java.util.List;
...@@ -28,6 +25,8 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> { ...@@ -28,6 +25,8 @@ public interface EkpSettleService extends IService<TInsuranceTypeRate> {
DeptSettleVo getDeptSettle(String id); DeptSettleVo getDeptSettle(String id);
EkpInsuranceDeptInfoVo getInsuranceEkpDeptInfo(String deptNo);
DeptSettleVo getDeptYgSettle(String id); DeptSettleVo getDeptYgSettle(String id);
/** /**
......
package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.EkpInsurancesInfo;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpInsurancesInfoMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpInsurancesInfoService;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
* 商险订单明细表
*
* @author huych
* @date 2025-02-07 15:17:24
*/
@Log4j2
@Service
public class EkpInsurancesInfoServiceImpl extends ServiceImpl<EkpInsurancesInfoMapper, EkpInsurancesInfo> implements EkpInsurancesInfoService {
}
...@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,10 +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.entity.TInsuranceTypeRate;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper; 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.service.ekp.EkpSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.DeptSettleVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
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;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -37,6 +34,11 @@ public class EkpSettleServiceImpl implements EkpSettleService { ...@@ -37,6 +34,11 @@ public class EkpSettleServiceImpl implements EkpSettleService {
return ekpSettleMapper.getDeptSettle(id); return ekpSettleMapper.getDeptSettle(id);
} }
@Override
public EkpInsuranceDeptInfoVo getInsuranceEkpDeptInfo(String deptNo) {
return ekpSettleMapper.getInsuranceEkpDeptInfo(deptNo);
}
@Override @Override
public DeptSettleVo getDeptYgSettle(String id) { public DeptSettleVo getDeptYgSettle(String id) {
return ekpSettleMapper.getDeptYgSettle(id); return ekpSettleMapper.getDeptYgSettle(id);
......
...@@ -2338,7 +2338,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2338,7 +2338,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard()); ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId()); ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
ekpUpdateParam.setFd_3b5bf0b7b4c058("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + invoiceNoInfo + policeNoInfo); ekpUpdateParam.setFd_3b5bf0b7b4c058("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + invoiceNoInfo + policeNoInfo);
eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam); doJointInsuranceTask.updateInsrancesDetail(ekpUpdateParam);
} catch (Exception e) { } catch (Exception e) {
log.error("pushEkp error registeredInvoiceNo:", e.getMessage()); log.error("pushEkp error registeredInvoiceNo:", e.getMessage());
} }
...@@ -2470,7 +2470,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2470,7 +2470,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard()); ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId()); ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString()); ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam); doJointInsuranceTask.updateInsrancesDetail(ekpUpdateParam);
}catch (Exception e){ }catch (Exception e){
log.error("pushEkp error updateInsuranceInsured:", e); log.error("pushEkp error updateInsuranceInsured:", e);
} }
...@@ -2600,7 +2600,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2600,7 +2600,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard()); ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard());
ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId() + "_" + byId.getDefaultSettleId()); ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId() + "_" + byId.getDefaultSettleId());
ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString()); ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam); doJointInsuranceTask.updateInsrancesDetail(ekpUpdateParam);
}catch (Exception e){ }catch (Exception e){
log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage()); log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
} }
...@@ -5069,7 +5069,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5069,7 +5069,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}else{ }else{
ekpInteractiveParam.setEstimateStatus(EkpConstants.NOTHING); ekpInteractiveParam.setEstimateStatus(EkpConstants.NOTHING);
} }
String body = eKPInsuranceUtil.sendToEkp(ekpInteractiveParam); String body = doJointInsuranceTask.insertInsrancesDetail(ekpInteractiveParam);
if (!StringUtils.isBlank(body)){ if (!StringUtils.isBlank(body)){
TInsuranceOperate insuranceOperate = new TInsuranceOperate(); TInsuranceOperate insuranceOperate = new TInsuranceOperate();
insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId()); insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId());
...@@ -5232,7 +5232,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5232,7 +5232,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setDeptNo(success.getOldDeptNo()); interactiveParam.setDeptNo(success.getOldDeptNo());
interactiveParam.setDeptName(success.getOldDeptName()); interactiveParam.setDeptName(success.getOldDeptName());
interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String deleteBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(deleteBody)) { if (StringUtils.isNotBlank(deleteBody)) {
//推送成功更新作废推送状态 //推送成功更新作废推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -5250,7 +5250,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5250,7 +5250,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setDefaultSettleId(newInsuranceSettle.getId()); interactiveParam.setDefaultSettleId(newInsuranceSettle.getId());
String pushResult = eKPInsuranceUtil.sendToEkp(interactiveParam); String pushResult = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(pushResult)){ if (StringUtils.isNotBlank(pushResult)){
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -5275,7 +5275,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5275,7 +5275,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5285,7 +5285,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5285,7 +5285,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -5361,7 +5361,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5361,7 +5361,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String addBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String addBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(addBody)){ if (StringUtils.isNotBlank(addBody)){
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -5386,7 +5386,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5386,7 +5386,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5396,7 +5396,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5396,7 +5396,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -5451,7 +5451,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5451,7 +5451,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if(StringUtils.isNotBlank(estimateBody)){ if(StringUtils.isNotBlank(estimateBody)){
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
tInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); tInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5504,7 +5504,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5504,7 +5504,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setActualPremium(one.getActualPremium()); interactiveParam.setActualPremium(one.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String deleteBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if(StringUtils.isNotBlank(deleteBody)){ if(StringUtils.isNotBlank(deleteBody)){
//推送成功更新作废推送状态 //推送成功更新作废推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -5525,7 +5525,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5525,7 +5525,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if(StringUtils.isNotBlank(actualBody)){ if(StringUtils.isNotBlank(actualBody)){
//推送成功,更新推送状态 //推送成功,更新推送状态
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -5550,7 +5550,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5550,7 +5550,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
//推送成功,更新预估和实际保费的推送状态 //推送成功,更新预估和实际保费的推送状态
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
...@@ -5561,7 +5561,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5561,7 +5561,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -5647,7 +5647,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5647,7 +5647,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setActualPremium(one.getActualPremium()); interactiveParam.setActualPremium(one.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String deleteBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if(StringUtils.isNotBlank(deleteBody)){ if(StringUtils.isNotBlank(deleteBody)){
//先推送预估,再推送实际 //先推送预估,再推送实际
interactiveParam.setDefaultSettleId(newInsuranceSettle.getId()); interactiveParam.setDefaultSettleId(newInsuranceSettle.getId());
...@@ -5661,7 +5661,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5661,7 +5661,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5671,7 +5671,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5671,7 +5671,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -5738,7 +5738,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5738,7 +5738,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5748,7 +5748,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5748,7 +5748,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String actualBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -5780,7 +5780,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5780,7 +5780,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String deleteBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(deleteBody)) { if (StringUtils.isNotBlank(deleteBody)) {
//推送成功后更新作废信息推送状态 //推送成功后更新作废信息推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -5817,7 +5817,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5817,7 +5817,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
//推送成功更新预估推送状态 //推送成功更新预估推送状态
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5859,7 +5859,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5859,7 +5859,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam); String estimateBody = doJointInsuranceTask.insertInsrancesDetail(interactiveParam);
if(StringUtils.isNotBlank(estimateBody)){ if(StringUtils.isNotBlank(estimateBody)){
//推送成功更新预估推送状态 //推送成功更新预估推送状态
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -7440,7 +7440,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7440,7 +7440,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
param.setSettleType(CommonConstants.EMPTY_STRING); param.setSettleType(CommonConstants.EMPTY_STRING);
pushType = CommonConstants.FOUR_INT; pushType = CommonConstants.FOUR_INT;
} }
String s = eKPInsuranceUtil.sendToEkp(param); String s = doJointInsuranceTask.insertInsrancesDetail(param);
if(StringUtils.isBlank(s)){ if(StringUtils.isBlank(s)){
saveInsuranceEkp(param,pushType); saveInsuranceEkp(param,pushType);
return null; return null;
......
package com.yifu.cloud.plus.v1.yifu.insurances.util; package com.yifu.cloud.plus.v1.yifu.insurances.util;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpIdCardAndDeptVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpIdCardAndDeptVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.BigDecimalUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants; import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants; import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.*; import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpInsurancesInfoMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TUpdateStatusErrorMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TUpdateStatusErrorMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService; import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService; import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleCancelService; import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleCancelService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService; import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpSocialViewVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpStatusParamVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -33,6 +30,7 @@ import org.springframework.scheduling.annotation.Async; ...@@ -33,6 +30,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.ParseException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -50,9 +48,6 @@ public class DoJointInsuranceTask { ...@@ -50,9 +48,6 @@ public class DoJointInsuranceTask {
@Resource @Resource
private TInsuranceSettleService tInsuranceSettleService; private TInsuranceSettleService tInsuranceSettleService;
@Autowired
private EkpInsuranceUtil eKPInsuranceUtil;
@Autowired @Autowired
private TInsuranceEkpService tInsuranceEkpService; private TInsuranceEkpService tInsuranceEkpService;
...@@ -77,6 +72,9 @@ public class DoJointInsuranceTask { ...@@ -77,6 +72,9 @@ public class DoJointInsuranceTask {
@Autowired @Autowired
private ArchivesDaprUtil archivesDaprUtil; private ArchivesDaprUtil archivesDaprUtil;
@Autowired
private EkpInsurancesInfoMapper insurancesInfoMapper;
/** /**
* @Description: 商险明细推送 * @Description: 商险明细推送
...@@ -204,7 +202,7 @@ public class DoJointInsuranceTask { ...@@ -204,7 +202,7 @@ public class DoJointInsuranceTask {
param.setSettleType(CommonConstants.EMPTY_STRING); param.setSettleType(CommonConstants.EMPTY_STRING);
pushType = CommonConstants.FOUR_INT; pushType = CommonConstants.FOUR_INT;
} }
String s = eKPInsuranceUtil.sendToEkp(param); String s = this.insertInsrancesDetail(param);
if(StringUtils.isBlank(s)){ if(StringUtils.isBlank(s)){
saveInsuranceEkp(param,pushType); saveInsuranceEkp(param,pushType);
return null; return null;
...@@ -543,4 +541,301 @@ public class DoJointInsuranceTask { ...@@ -543,4 +541,301 @@ public class DoJointInsuranceTask {
} }
} }
} }
/**
* 商险接口表单触发重写
*
* @author huych
* @param param 转换类
* @return {@link TInsuranceSettlePushParam}
*/
public String insertInsrancesDetail(EkpInteractiveParam param) {
try {
EkpInsurancesInfo pushParam = new EkpInsurancesInfo();
//作废
if (InsurancesConstants.ABOLISH_SETTLE_BILL.equals(param.getInteractiveType())) {
insurancesInfoMapper.delete(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getDetailId())
.eq(EkpInsurancesInfo::getFd_3adfe6ec6a8cbe, "未结算"));
}
//查询项目信息
EkpInsuranceDeptInfoVo deptInfoVo = ekpSettleService.getInsuranceEkpDeptInfo(param.getDeptNo());
if (null == deptInfoVo) {
return null;
}
//新建商险订单明细
if (InsurancesConstants.NEW_SETTLE_BILL.equals(param.getInteractiveType())) {
initValues(pushParam, deptInfoVo, param);
//应收
double ys = 0L;
if (!"是".equals(deptInfoVo.getIsBpo())) {
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType()) && "有".equals(pushParam.getFd_3af9d1441ef7b6())) {
ys = BigDecimalUtils.safeSubtract(false, param.getActualPremium(), param.getEstimatePremium()).doubleValue();
} else if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType()) && "无".equals(pushParam.getFd_3af9d1441ef7b6())) {
ys = param.getActualPremium().doubleValue();
} else {
ys = param.getEstimatePremium().doubleValue();
}
}
pushParam.setFd_3adfe6e30f2a3c(ys);
//付款状态
pushParam.setFd_3adfe6f05531ec("未付");
//是否bpo客户
pushParam.setFd_3b178fab62d196(null != param.getBpoFlag() ? param.getBpoFlag() : CommonConstants.EMPTY_STRING);
//派单客服姓名
pushParam.setFd_3c6f0108e05c84(null != param.getCreateName() ? param.getCreateName() : CommonConstants.EMPTY_STRING);
//商险封面抬头
pushParam.setFd_3b941cbcea3e1a(deptInfoVo.getInsurancesTitle());
//是否启用BPO结算模式
pushParam.setFd_usebpo_settle(deptInfoVo.getBpoSettle());
insurancesInfoMapper.insert(pushParam);
//更新预估单实缴数据(新增预估实缴单时)
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType())) {
EkpInsurancesInfo info = insurancesInfoMapper.selectOne(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getDetailId())
.eq(EkpInsurancesInfo::getFd_3adfe6ec6a8cbe, "未结算")
.eq(EkpInsurancesInfo::getFd_3adfe6af71a1cc, "预估")
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(info)) {
initValueUpdate(info, deptInfoVo, param);
}
}
}
//红冲
if (InsurancesConstants.CORRECT_SETTLE_BILL.equals(param.getInteractiveType())) {
initValues(pushParam, deptInfoVo, param);
//应收
pushParam.setFd_3adfe6e30f2a3c(InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType()) ? param.getActualPremium().doubleValue() :param.getEstimatePremium().doubleValue());
insurancesInfoMapper.insert(pushParam);
}
//更新
if (InsurancesConstants.UPDATE_SETTLE_BILL.equals(param.getInteractiveType())) {
//更新商险订单明细数据(应收金额不更新)
List<EkpInsurancesInfo> list = insurancesInfoMapper.selectList(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getDetailId())
.eq(EkpInsurancesInfo::getFd_3adfe6ec6a8cbe, "未结算"));
if (Common.isNotNull(list) && !list.isEmpty()) {
for (EkpInsurancesInfo info: list) {
initValueUpdate(info, deptInfoVo, param);
}
}
//更新实缴单据应收金额
EkpInsurancesInfo info = insurancesInfoMapper.selectOne(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getDetailId())
.eq(EkpInsurancesInfo::getFd_3adfe6ec6a8cbe, "未结算")
.eq(EkpInsurancesInfo::getFd_3adfe6af71a1cc, "实缴")
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(info)) {
//实际保费
info.setFd_3adfe6610c0d2c(null != param.getActualPremium() ? param.getActualPremium().doubleValue() : null);
//应收
pushParam.setFd_3adfe6e30f2a3c("是".equals(param.getBpoFlag()) ? 0 : BigDecimalUtils.safeSubtract(false,param.getActualPremium(),param.getEstimatePremium()).doubleValue());
//应支
pushParam.setFd_3adfe6e3911ffe(InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType()) ? param.getActualPremium().doubleValue() : 0);
insurancesInfoMapper.updateById(info);
}
}
return "sucess";
}catch (Exception e) {
log.error("执行异常", e);
return null;
}
}
/**
* 更新商险订单明细
*
* @author huych
* @param param 转换类
* @return {@link TInsuranceSettlePushParam}
*/
@Async
public void updateInsrancesDetail(EkpUpdateParam param) {
try {
//更新商险变更记录已结算
EkpInsurancesInfo info = insurancesInfoMapper.selectOne(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getFd_3b5bf032d7a822())
.ne(EkpInsurancesInfo::getFd_3adfe6eda67236, "未结算"));
if (Common.isNotNull(info)) {
//保单开始时间
info.setFd_3b5bf17ae91f9c(DateUtil.stringToDate(param.getFd_3b5bf02d3b8fc4()));
//保单结束时间
info.setFd_3b5bf17c6df310(DateUtil.stringToDate(param.getFd_3b5bf02e1d47cc()));
//投保类型
info.setFd_3b5bf17d9297c2(param.getFd_3b5bf02fa14596());
//变更发票号
info.setFd_3b5bf17f2fc25c(param.getFd_3b5bf030ab1a56());
//变更购买标准
info.setFd_3b5bf180e08fbe(param.getFd_3b5bf031b52314());
//商险变更记录
info.setFd_3b5bf1628c5a68(null != info.getFd_3b3e4653122c9e() ? info.getFd_3b3e4653122c9e() : ""
+ "\\n" + param.getFd_3b5bf0b7b4c058());
insurancesInfoMapper.updateById(info);
} else {
//更新商险变更记录未结算
EkpInsurancesInfo unInfo = insurancesInfoMapper.selectOne(Wrappers.<EkpInsurancesInfo>query().lambda()
.eq(EkpInsurancesInfo::getFd_3b0a5743acab7e, param.getFd_3b5bf032d7a822())
.eq(EkpInsurancesInfo::getFd_3adfe6eda67236, "未结算"));
if (Common.isNotNull(unInfo)) {
//发票号
if (Common.isNotNull(param.getFd_3b5bf030ab1a56())) {
unInfo.setFd_3adfe65e0cd094(param.getFd_3b5bf030ab1a56());
}
//保单号
if (Common.isNotNull(param.getFd_3bb431933ee968())) {
unInfo.setFd_3adfe65e60e110(param.getFd_3bb431933ee968());
}
//保险开始日期
unInfo.setFd_3adfe6b7e0ede8(DateUtil.stringToDate(param.getFd_3b5bf02d3b8fc4()));
//保险结束日期
unInfo.setFd_3adfe6b847bfe6(DateUtil.stringToDate(param.getFd_3b5bf02e1d47cc()));
//购买标准
unInfo.setFd_3adfe6d55384c6(Double.parseDouble(null == param.getFd_3b5bf031b52314() ? "0" : param.getFd_3b5bf031b52314()));
//保单开始时间
unInfo.setFd_3b5bf17ae91f9c(DateUtil.stringToDate(param.getFd_3b5bf02d3b8fc4()));
//保单结束时间
unInfo.setFd_3b5bf17c6df310(DateUtil.stringToDate(param.getFd_3b5bf02e1d47cc()));
//投保类型
unInfo.setFd_3b5bf17d9297c2(param.getFd_3b5bf02fa14596());
//变更发票号
if (Common.isNotNull(param.getFd_3b5bf030ab1a56())) {
unInfo.setFd_3b5bf17f2fc25c(param.getFd_3b5bf030ab1a56());
}
//变更购买标准
unInfo.setFd_3b5bf180e08fbe(param.getFd_3b5bf031b52314());
//商险变更记录
unInfo.setFd_3b5bf1628c5a68(null != info.getFd_3b3e4653122c9e() ? info.getFd_3b3e4653122c9e() : ""
+ "\\n" + param.getFd_3b5bf0b7b4c058());
insurancesInfoMapper.updateById(unInfo);
}
}
}catch (Exception e) {
log.error("执行异常", e);
}
}
public static String dateStringInsert(String month) {
if (month.length() == 6) {
StringBuilder sb = new StringBuilder(month);
sb.insert(4, "-");
return sb.toString();
}
return month;
}
//商险新增初始化
public void initValues(EkpInsurancesInfo pushParam,EkpInsuranceDeptInfoVo deptInfoVo,EkpInteractiveParam param) throws ParseException {
//单号
pushParam.setFd_3adfe67a9f6364("SXDD" + LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.ISO_DATE_FORMAT)
+ "_" + param.getDetailId());
//项目id 项目编码
pushParam.setFd_3b16dfb32778f2(deptInfoVo.getFdId());
pushParam.setFd_3b16dfb32778f2_text(deptInfoVo.getDeptNo());
//实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM")
if ("结算月本月数据".equals(deptInfoVo.getInsurancesType())) {
pushParam.setFd_3af9d11088facc(DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM"));
} else if ("生成月上月数据".equals(deptInfoVo.getInsurancesType())) {
pushParam.setFd_3af9d11088facc(DateUtil.addMonthByDate(DateUtil.parseDate(param.getSettleMonth(), "yyyyMM"), -1));
} else {
pushParam.setFd_3af9d11088facc(null);
}
//是否全部结算
pushParam.setFd_3b13b2ecc164aa("全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? "是" : "否");
//ekpId
if (null != param.getDetailId() && null != param.getDefaultSettleId()) {
pushParam.setFd_3b0a5743acab7e(param.getDetailId() + CommonConstants.DOWN_LINE_STRING + param.getDefaultSettleId());
} else {
pushParam.setFd_3b0a5743acab7e(CommonConstants.EMPTY_STRING);
}
//单据类型
pushParam.setFd_3adfe6af71a1cc(null != param.getSettleType() ? param.getSettleType() : CommonConstants.EMPTY_STRING);
//项目编码
pushParam.setFd_3adfe658c6229e(null != param.getDeptNo() ? param.getDeptNo() : CommonConstants.EMPTY_STRING);
//项目名称
pushParam.setFd_3adfe6592b4158(null != param.getDeptName() ? param.getDeptName() : CommonConstants.EMPTY_STRING);
//客户编码
pushParam.setFd_3adfe6598281e8(null != param.getCustomerCode() ? param.getCustomerCode() : CommonConstants.EMPTY_STRING);
//客户名称
pushParam.setFd_3adfe7a2688902(null != param.getCustomerName() ? param.getCustomerName() : CommonConstants.EMPTY_STRING);
//发生日期
pushParam.setFd_3adfe67c24dace(DateUtil.getCurrentDateTime());
//姓名
pushParam.setFd_3adfe65d759650(null != param.getEmpName() ? param.getEmpName() : CommonConstants.EMPTY_STRING);
//身份证号
pushParam.setFd_3adfe65dbd9f68(null != param.getEmpIdcardNo() ? param.getEmpIdcardNo() : CommonConstants.EMPTY_STRING);
//发票号
pushParam.setFd_3adfe65e0cd094(null != param.getInvoiceNo() ? param.getInvoiceNo() : CommonConstants.EMPTY_STRING);
//险种
pushParam.setFd_3adfe65f6599e4(null != param.getInsuranceTypeName() ? param.getInsuranceTypeName() : CommonConstants.EMPTY_STRING);
//保险公司
pushParam.setFd_3adfe65ea04728(null != param.getInsuranceCompanyName() ? param.getInsuranceCompanyName() : CommonConstants.EMPTY_STRING);
//保单号
pushParam.setFd_3adfe65e60e110(null != param.getPolicyNo() ? param.getPolicyNo() : CommonConstants.EMPTY_STRING);
//保险开始日期
pushParam.setFd_3adfe6b7e0ede8(null != param.getPolicyStart() ? DateUtil.stringToDate(param.getPolicyStart().toString()) : null);
//保险结束日期
pushParam.setFd_3adfe6b847bfe6(null != param.getPolicyEnd() ? DateUtil.stringToDate(param.getPolicyEnd().toString()) : null);
//购买标准
pushParam.setFd_3adfe6d55384c6(null != param.getBuyStandard() ? Double.parseDouble(param.getBuyStandard()) : null);
//实际保费
pushParam.setFd_3adfe6610c0d2c(null != param.getActualPremium() ? param.getActualPremium().doubleValue() : null);
//医保
pushParam.setFd_3adfe66041a996(null != param.getMedicalQuota() ? Double.parseDouble(param.getMedicalQuota()) : null);
//事故或残疾
pushParam.setFd_3adfe6609aa810(null != param.getDieDisableQuota() ? param.getDieDisableQuota() : CommonConstants.EMPTY_STRING);
//预估保费
pushParam.setFd_3af9d15f7018fa(null != param.getEstimatePremium() ? param.getEstimatePremium().doubleValue() : null);
//hro结算月
pushParam.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM") : null);
//有无预估
pushParam.setFd_3af9d1441ef7b6(null != param.getEstimateStatus() ? param.getEstimateStatus() : CommonConstants.EMPTY_STRING);
//结算状态
pushParam.setFd_3adfe6ec6a8cbe("未结算");
//收款状态
pushParam.setFd_3adfe6ef5dfaac("未收");
//支出结算状态
pushParam.setFd_3adfe6eda67236("未结算");
//创建时间
pushParam.setCreateTime(DateUtil.getCurrentDateTime());
//应支出
pushParam.setFd_3adfe6e3911ffe("实缴".equals(param.getSettleType()) ? pushParam.getFd_3adfe6610c0d2c() : 0);
}
//商险更新赋值
public void initValueUpdate(EkpInsurancesInfo info,EkpInsuranceDeptInfoVo deptInfoVo,EkpInteractiveParam param) throws ParseException {
//实际结算月份
info.setFd_3af9d11088facc("全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? DateUtil.parseDate(param.getSettleMonth(), "yyyyMM") : null);
//是否全部结算
info.setFd_3b13b2ecc164aa("全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? "是" : "否");
//预估保费
info.setFd_3af9d15f7018fa(null != param.getEstimatePremium() ? param.getEstimatePremium().doubleValue() : null);
//发票号
if (Common.isNotNull(param.getInvoiceNo())) {
info.setFd_3adfe65e0cd094(param.getInvoiceNo());
}
//险种
info.setFd_3adfe65f6599e4(null != param.getInsuranceTypeName() ? param.getInsuranceTypeName() : CommonConstants.EMPTY_STRING);
//保险公司
info.setFd_3adfe65ea04728(null != param.getInsuranceCompanyName() ? param.getInsuranceCompanyName() : CommonConstants.EMPTY_STRING);
//保单号
if (Common.isNotNull(param.getPolicyNo())) {
info.setFd_3adfe65e60e110(param.getPolicyNo());
}
info.setFd_3adfe65e60e110(null != param.getPolicyNo() ? param.getPolicyNo() : CommonConstants.EMPTY_STRING);
//保险开始日期
info.setFd_3adfe6b7e0ede8(null != param.getPolicyStart() ? DateUtil.stringToDate(param.getPolicyStart().toString()) : null);
//保险结束日期
info.setFd_3adfe6b847bfe6(null != param.getPolicyEnd() ? DateUtil.stringToDate(param.getPolicyEnd().toString()) : null);
//购买标准
info.setFd_3adfe6d55384c6(null != param.getBuyStandard() ? Double.parseDouble(param.getBuyStandard()) : null);
//实际保费
info.setFd_3adfe6610c0d2c(null != param.getActualPremium() ? param.getActualPremium().doubleValue() : null);
//医保
info.setFd_3adfe66041a996(null != param.getMedicalQuota() ? Double.parseDouble(param.getMedicalQuota()) : null);
//事故或残疾
info.setFd_3adfe6609aa810(null != param.getDieDisableQuota() ? param.getDieDisableQuota() : CommonConstants.EMPTY_STRING);
//hro结算月
info.setFd_3b13b3076af5a0(null != param.getSettleMonth() ? DateUtil.parseDate(dateStringInsert(param.getSettleMonth()), "yyyy-MM") : null);
insurancesInfoMapper.updateById(info);
}
} }
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpInsurancesInfoMapper">
</mapper>
...@@ -191,6 +191,21 @@ ...@@ -191,6 +191,21 @@
and gongzi.fd_3aeadf17522642 = #{settleNo} and gongzi.fd_3aeadf17522642 = #{settleNo}
</if> </if>
</select> </select>
<!--查询项目信息-->
<select id="getInsuranceEkpDeptInfo" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceDeptInfoVo">
SELECT
a.fd_id as fdId,
a.fd_3b1480cd9dcb60 as settleType,
a.fd_3b15f64dd59a28 as isBpo,
a.fd_3b13b272078eda as insurancesType,
a.fd_3b1480c5fe3580_text as insurancesTitle,
a.fd_usebpo_settle as bpoSettle,
a.fd_3a37fe508071fe as deptNo
from ekp_24a8e6a7fc143bb8c48a a
where a.fd_3a37fe508071fe = #{deptNo}
limit 1
</select>
</mapper> </mapper>
......
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