|
@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
import com.ydtech.modules.admin.service.SysUserService;
|
|
|
import com.ydtech.modules.esm.service.EsmUserReferrerService;
|
|
import com.ydtech.modules.esm.service.EsmUserReferrerService;
|
|
|
|
|
+import com.ydtech.modules.fnc.dao.FncInsAreaCompanyMapper;
|
|
|
import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
|
|
import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
|
|
|
import com.ydtech.modules.fnc.entity.InsFeeAudit;
|
|
import com.ydtech.modules.fnc.entity.InsFeeAudit;
|
|
|
import com.ydtech.modules.fnc.dao.InsFeeAuditMapper;
|
|
import com.ydtech.modules.fnc.dao.InsFeeAuditMapper;
|
|
@@ -17,11 +18,9 @@ import com.ydtech.modules.ins.service.InsCommissionService;
|
|
|
import com.ydtech.modules.ins.service.InsCompanyFeeService;
|
|
import com.ydtech.modules.ins.service.InsCompanyFeeService;
|
|
|
import com.ydtech.modules.ins.service.InsDeptFeeService;
|
|
import com.ydtech.modules.ins.service.InsDeptFeeService;
|
|
|
import com.ydtech.modules.order.dao.InsOrdersMapper;
|
|
import com.ydtech.modules.order.dao.InsOrdersMapper;
|
|
|
-import com.ydtech.modules.order.entity.InsAreaCompany;
|
|
|
|
|
|
|
+import com.ydtech.modules.fnc.entity.InsAreaCompany;
|
|
|
import com.ydtech.modules.order.entity.InsFeeOrder;
|
|
import com.ydtech.modules.order.entity.InsFeeOrder;
|
|
|
import com.ydtech.modules.order.entity.InsOrders;
|
|
import com.ydtech.modules.order.entity.InsOrders;
|
|
|
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
|
|
|
|
|
-import com.ydtech.modules.order.service.InsAreaCompanyService;
|
|
|
|
|
import com.ydtech.modules.order.service.InsFeeOrderService;
|
|
import com.ydtech.modules.order.service.InsFeeOrderService;
|
|
|
import com.ydtech.modules.order.service.InsOrdersService;
|
|
import com.ydtech.modules.order.service.InsOrdersService;
|
|
|
import com.ydtech.utils.DateUtil;
|
|
import com.ydtech.utils.DateUtil;
|
|
@@ -51,7 +50,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
|
|
|
|
|
private final InsFeeOrderService insFeeOrderService;
|
|
private final InsFeeOrderService insFeeOrderService;
|
|
|
|
|
|
|
|
- private final InsAreaCompanyService insAreaCompanyService;
|
|
|
|
|
|
|
+ private final FncInsAreaCompanyMapper insAreaCompanyMapper;
|
|
|
|
|
|
|
|
private final InsDeptFeeService insDeptFeeService;
|
|
private final InsDeptFeeService insDeptFeeService;
|
|
|
private final InsCommissionService insCommissionService;
|
|
private final InsCommissionService insCommissionService;
|
|
@@ -61,8 +60,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
private final SysUserService sysUserService;
|
|
private final SysUserService sysUserService;
|
|
|
|
|
|
|
|
|
|
|
|
|
- public InsFeeAuditServiceImpl(InsAreaCompanyService insAreaCompanyService, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
|
|
|
|
|
- this.insAreaCompanyService = insAreaCompanyService;
|
|
|
|
|
|
|
+ public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
|
|
|
|
|
+ this.insAreaCompanyMapper = insAreaCompanyMapper;
|
|
|
this.insOrdersMapper = insOrdersMapper;
|
|
this.insOrdersMapper = insOrdersMapper;
|
|
|
this.insFeeOrderService=insFeeOrderService;
|
|
this.insFeeOrderService=insFeeOrderService;
|
|
|
this.insDeptFeeService=insDeptFeeService;
|
|
this.insDeptFeeService=insDeptFeeService;
|
|
@@ -85,7 +84,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
|
|
|
|
|
InsOrders order=insOrdersMapper.selectById(orderNo);
|
|
InsOrders order=insOrdersMapper.selectById(orderNo);
|
|
|
InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
|
|
InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
|
|
|
- InsAreaCompany insAreaCompany=insAreaCompanyService.getById(insFeeAudit.getInsOrderNo());
|
|
|
|
|
|
|
+ InsAreaCompany insAreaCompany=insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
|
|
|
|
|
|
|
|
//bigdecimal为null时设置为0
|
|
//bigdecimal为null时设置为0
|
|
|
handleBigdecimal(insFeeOrder);
|
|
handleBigdecimal(insFeeOrder);
|
|
@@ -147,9 +146,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
insPlyIncome.setOrderno(order.getOrderno());
|
|
insPlyIncome.setOrderno(order.getOrderno());
|
|
|
insPlyIncome.setDeptId(order.getDeptid());
|
|
insPlyIncome.setDeptId(order.getDeptid());
|
|
|
insPlyIncome.setCompanyId(plyDto.getCompanyId());
|
|
insPlyIncome.setCompanyId(plyDto.getCompanyId());
|
|
|
- insPlyIncome.setAgreementId(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ insPlyIncome.setAgreementId(String.valueOf(plyDto.getAgreementId()));
|
|
|
insPlyIncome.setLicenseno(order.getLicenseno());
|
|
insPlyIncome.setLicenseno(order.getLicenseno());
|
|
|
insPlyIncome.setPayDate(StringUtils.isNullOrEmpty(plyDto.getPayDate())?plyDto.getCreatetime():plyDto.getPayDate());
|
|
insPlyIncome.setPayDate(StringUtils.isNullOrEmpty(plyDto.getPayDate())?plyDto.getCreatetime():plyDto.getPayDate());
|
|
|
|
|
+ insPlyIncome.setSignDate(StringUtils.isNullOrEmpty(plyDto.getInsidePayTime())?plyDto.getPayDate():plyDto.getInsidePayTime());
|
|
|
insPlyIncome.setCreateTime(LocalDateTime.now() );
|
|
insPlyIncome.setCreateTime(LocalDateTime.now() );
|
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
|
insPlyIncome.setPolicyno(plyDto.getJqpolicyno());
|
|
insPlyIncome.setPolicyno(plyDto.getJqpolicyno());
|
|
@@ -187,9 +187,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
InsDeptFee deptFee = new InsDeptFee();
|
|
InsDeptFee deptFee = new InsDeptFee();
|
|
|
deptFee.setOrderno(order.getOrderno());
|
|
deptFee.setOrderno(order.getOrderno());
|
|
|
deptFee.setQuoteno(insFeeOrder.getInsOrderNo());
|
|
deptFee.setQuoteno(insFeeOrder.getInsOrderNo());
|
|
|
- deptFee.setAgreeid(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ deptFee.setAgreeid(String.valueOf(plyDto.getAgreementId()));
|
|
|
deptFee.setAuditstatus("1");
|
|
deptFee.setAuditstatus("1");
|
|
|
deptFee.setSettlestatus("0");
|
|
deptFee.setSettlestatus("0");
|
|
|
|
|
+ deptFee.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
deptFee.setInscompany(plyDto.getCompanyId());
|
|
deptFee.setInscompany(plyDto.getCompanyId());
|
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
|
deptFee.setPolicyno(plyDto.getJqpolicyno());
|
|
deptFee.setPolicyno(plyDto.getJqpolicyno());
|
|
@@ -266,13 +267,14 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setDeptid(order.getDeptid());
|
|
commission.setDeptid(order.getDeptid());
|
|
|
commission.setDeptname(order.getDeptname());
|
|
commission.setDeptname(order.getDeptname());
|
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
|
- commission.setAgreeid(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
|
|
|
commission.setRefereescode(user.getId());
|
|
commission.setRefereescode(user.getId());
|
|
|
commission.setRefereesname(user.getName());
|
|
commission.setRefereesname(user.getName());
|
|
|
commission.setLevel("3");
|
|
commission.setLevel("3");
|
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
|
- commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
|
|
|
|
|
|
|
+ commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
|
|
+ commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
|
commission.setRiskcode("交强");
|
|
commission.setRiskcode("交强");
|
|
@@ -301,7 +303,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setDeptid(order.getDeptid());
|
|
commission.setDeptid(order.getDeptid());
|
|
|
commission.setDeptname(order.getDeptname());
|
|
commission.setDeptname(order.getDeptname());
|
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
|
- commission.setAgreeid(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
|
|
|
commission.setRefereescode(user.getId());
|
|
commission.setRefereescode(user.getId());
|
|
|
commission.setRefereesname(user.getName());
|
|
commission.setRefereesname(user.getName());
|
|
|
// commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue());
|
|
// commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue());
|
|
@@ -309,7 +311,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setLevel("2");
|
|
commission.setLevel("2");
|
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
|
- commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
|
|
|
|
|
|
|
+ commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
|
|
+ commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
|
commission.setRiskcode("交强");
|
|
commission.setRiskcode("交强");
|
|
@@ -337,7 +340,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setDeptid(order.getDeptid());
|
|
commission.setDeptid(order.getDeptid());
|
|
|
commission.setDeptname(order.getDeptname());
|
|
commission.setDeptname(order.getDeptname());
|
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
commission.setInscompany(plyDto.getCompanyId());
|
|
|
- commission.setAgreeid(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
|
|
|
commission.setRefereescode(user.getId());
|
|
commission.setRefereescode(user.getId());
|
|
|
commission.setRefereesname(user.getName());
|
|
commission.setRefereesname(user.getName());
|
|
|
// commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue());
|
|
// commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue());
|
|
@@ -345,7 +348,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setLevel("1");
|
|
commission.setLevel("1");
|
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
commission.setAuditstatus("1"); //0未审核 1已审核
|
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
commission.setSettlestatus("0"); //0未结算 1已结算
|
|
|
- commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
|
|
|
|
|
|
|
+ commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
|
|
+ commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
|
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
commission.setPolicyno(plyDto.getJqpolicyno());
|
|
|
commission.setRiskcode("交强");
|
|
commission.setRiskcode("交强");
|
|
@@ -366,7 +370,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 生成个代费用
|
|
* 生成个代费用
|
|
|
* @param order
|
|
* @param order
|
|
@@ -380,7 +384,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
insCompanyFee.setFrameNo(order.getFrameno());
|
|
insCompanyFee.setFrameNo(order.getFrameno());
|
|
|
insCompanyFee.setLicenseNo(order.getLicenseno());
|
|
insCompanyFee.setLicenseNo(order.getLicenseno());
|
|
|
insCompanyFee.setInscompany(plyDto.getCompanyId());
|
|
insCompanyFee.setInscompany(plyDto.getCompanyId());
|
|
|
- insCompanyFee.setAgreeid(plyDto.getAgreementId());
|
|
|
|
|
|
|
+ insCompanyFee.setAgreeid(String.valueOf(plyDto.getAgreementId()));
|
|
|
insCompanyFee.setUserid(order.getUserid());
|
|
insCompanyFee.setUserid(order.getUserid());
|
|
|
insCompanyFee.setUsername(order.getUsername());
|
|
insCompanyFee.setUsername(order.getUsername());
|
|
|
insCompanyFee.setDeptid(order.getDeptid());
|
|
insCompanyFee.setDeptid(order.getDeptid());
|
|
@@ -388,7 +392,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
insCompanyFee.setSettletype("B");
|
|
insCompanyFee.setSettletype("B");
|
|
|
insCompanyFee.setSettlestatus("0");
|
|
insCompanyFee.setSettlestatus("0");
|
|
|
insCompanyFee.setCreatetime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
insCompanyFee.setCreatetime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
-
|
|
|
|
|
|
|
+ insCompanyFee.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
|
|
|
BigDecimal dept_rate=insFeeOrder.getFirstDeptProportion()
|
|
BigDecimal dept_rate=insFeeOrder.getFirstDeptProportion()
|
|
|
.add(insFeeOrder.getSecondDeptProportion())
|
|
.add(insFeeOrder.getSecondDeptProportion())
|
|
|
.add(insFeeOrder.getThirdDeptProportion())
|
|
.add(insFeeOrder.getThirdDeptProportion())
|