|
|
@@ -140,7 +140,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
@Autowired
|
|
|
private PushLgDataServerService dataServerService;
|
|
|
|
|
|
- private ExecutorService executorService= Executors.newCachedThreadPool();
|
|
|
+ private ExecutorService executorService = Executors.newCachedThreadPool();
|
|
|
@Autowired
|
|
|
private InsOrdersService insOrdersService;
|
|
|
|
|
|
@@ -165,11 +165,11 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void feeAudit(String orderNo, String insOrderNo, boolean isAutoAudit, String auditStatus) {
|
|
|
// add by 2024-09-25 强制配置电销组长逻辑
|
|
|
- InsOrders order = insOrdersMapper.selectById(orderNo);
|
|
|
- SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(order.getUserid());
|
|
|
- SysUser user = sysUserService.getById(order.getUserid());
|
|
|
- SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
|
- if("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())){
|
|
|
+ InsOrders order = insOrdersMapper.selectById(orderNo);
|
|
|
+ SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(order.getUserid());
|
|
|
+ SysUser user = sysUserService.getById(order.getUserid());
|
|
|
+ SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
|
+ if ("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())) {
|
|
|
//查找电销组长,没有的话提示
|
|
|
if (StringUtils.isBlank(user.getManagerId())) {
|
|
|
throw new SystemException("电销组员未配置电销管理人");
|
|
|
@@ -202,9 +202,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
//add by hxl 2024-05-07 begin ==========
|
|
|
//判断当前用户是否是出单员,如果是直接给团队长结算 角色id为19为出单员
|
|
|
String userId = "";
|
|
|
- // SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(order.getUserid());
|
|
|
- // SysUser user = sysUserService.getById(order.getUserid());
|
|
|
- // SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
|
+ // SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(order.getUserid());
|
|
|
+ // SysUser user = sysUserService.getById(order.getUserid());
|
|
|
+ // SysDept dept = sysDeptService.getById(user.getDeptId());
|
|
|
//出单员是19 且是渠道的话,给渠道团队长
|
|
|
if ("19".equals(sysUserBaseVO.getRoleId()) && "1".equals(dept.getManagementSource())) {
|
|
|
//查找该出单员的的团队长
|
|
|
@@ -214,7 +214,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
// throw new SystemException("出单员" + sysUserBaseVO.getName() + "所在机构缺少团队长,请设置!!!");
|
|
|
//}
|
|
|
//添加电销出单员出去单给电销组长结算
|
|
|
- } else if("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())){
|
|
|
+ } else if ("3".equals(sysUserBaseVO.getRoleId()) && "3".equals(dept.getManagementSource())) {
|
|
|
//查找电销组长
|
|
|
userId = user.getManagerId();
|
|
|
} else {
|
|
|
@@ -227,12 +227,15 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
//用户出口手续费
|
|
|
BigDecimal totalPremiumAmount = new BigDecimal(0);
|
|
|
totalPremiumAmount = totalPremiumAmount.add(insFeeOrderNew.getJqExportSuperviseCostsPremiums())
|
|
|
- .add(insFeeOrderNew.getSyExportSuperviseCostsPremiums()).add(insFeeOrderNew.getNoExportSuperviseCostsPremiums());
|
|
|
+ .add(insFeeOrderNew.getSyExportSuperviseCostsPremiums())
|
|
|
+ .add(insFeeOrderNew.getNoExportSuperviseCostsPremiums());
|
|
|
|
|
|
//用户出口跟单费
|
|
|
BigDecimal totalOtherPremiumAmount = new BigDecimal(0);
|
|
|
totalOtherPremiumAmount =
|
|
|
- totalOtherPremiumAmount.add(insFeeOrderNew.getJqExportOtherCostsPremiums()).add(insFeeOrderNew.getSyExportOtherCostsPremiums()).add(insFeeOrderNew.getNoExportOtherCostsPremiums());
|
|
|
+ totalOtherPremiumAmount.add(insFeeOrderNew.getJqExportOtherCostsPremiums())
|
|
|
+ .add(insFeeOrderNew.getSyExportOtherCostsPremiums())
|
|
|
+ .add(insFeeOrderNew.getNoExportOtherCostsPremiums());
|
|
|
//用戶
|
|
|
//算佣金
|
|
|
this.countUserAmount(insFeeOrderNew, insAreaCompany.getId());
|
|
|
@@ -307,7 +310,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
|
|
|
// 如果机构信息不为空,更新管理费并记录历史
|
|
|
if (levelSysDeptAccount != null) {
|
|
|
- levelSysDeptAccount.setManagementFee(levelSysDeptAccount.getManagementFee().add(sumManagementFee));
|
|
|
+ levelSysDeptAccount.setManagementFee(levelSysDeptAccount.getManagementFee()
|
|
|
+ .add(sumManagementFee));
|
|
|
sysDeptAccountService.updateById(levelSysDeptAccount);
|
|
|
} else {
|
|
|
// 如果机构信息为空,新建机构信息并记录历史
|
|
|
@@ -332,7 +336,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
LambdaQueryWrapper<SysChannelCost> costWrapper = new LambdaQueryWrapper<>();
|
|
|
costWrapper.eq(SysChannelCost::getOrderNo, insOrderNo);
|
|
|
List<SysChannelCost> costList = sysChannelCostService.list(costWrapper);
|
|
|
- if(CollUtil.isNotEmpty(costList)){
|
|
|
+ if (CollUtil.isNotEmpty(costList)) {
|
|
|
for (SysChannelCost sysChannelCost : costList) {
|
|
|
sysChannelCost.setStatus(1); // 审核通过
|
|
|
sysChannelCost.setPayDate(insAreaCompany.getPayDate());
|
|
|
@@ -345,75 +349,81 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
|
|
|
//先把钱加到总账户,再修改抽层状态
|
|
|
List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
|
|
|
- .eq(SysPremiumDetails::getCompanyId,insAreaCompany.getId())
|
|
|
- .eq(SysPremiumDetails::getType,2)
|
|
|
- .eq(SysPremiumDetails::getStatus,0));
|
|
|
+ .eq(SysPremiumDetails::getCompanyId, insAreaCompany.getId())
|
|
|
+ .eq(SysPremiumDetails::getType, 2)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 0));
|
|
|
|
|
|
- if (sysPremiumDetails.isEmpty() && order.getIsExternal() == 1) {
|
|
|
+ if (sysPremiumDetails.isEmpty()) {
|
|
|
//已承保记录保费数据
|
|
|
com.ydtech.modules.order.entity.InsAreaCompany insAreaCompany1 = new com.ydtech.modules.order.entity.InsAreaCompany();
|
|
|
BeanUtils.copyProperties(insAreaCompany, insAreaCompany1);
|
|
|
insOrdersService.saveFeeInfo(insAreaCompany1);
|
|
|
+ sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
|
|
|
+ .eq(SysPremiumDetails::getCompanyId, insAreaCompany.getId())
|
|
|
+ .eq(SysPremiumDetails::getType, 2)
|
|
|
+ .eq(SysPremiumDetails::getStatus, 0));
|
|
|
}
|
|
|
|
|
|
- if (!sysPremiumDetails.isEmpty()) {
|
|
|
-
|
|
|
- Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
|
|
|
- .collect(Collectors.groupingBy(SysPremiumDetails::getUserId));
|
|
|
-
|
|
|
- for (String key : listMap.keySet()) {
|
|
|
- List<SysPremiumDetails> sysPremiumDetails1 = listMap.get(key);
|
|
|
-
|
|
|
- if (sysPremiumDetails1.size() > 1) {
|
|
|
+ Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream()
|
|
|
+ .sorted(Comparator.comparing(SysPremiumDetails::getId))
|
|
|
+ .collect(Collectors.groupingBy(SysPremiumDetails::getUserId));
|
|
|
+
|
|
|
+ for (String key : listMap.keySet()) {
|
|
|
+ List<SysPremiumDetails> sysPremiumDetails1 = listMap.get(key);
|
|
|
+
|
|
|
+ if (sysPremiumDetails1.size() > 1) {
|
|
|
+
|
|
|
+ SysPremiumDetails sysPremiumDetails2 = sysPremiumDetails1.get(0);
|
|
|
+ SysPartnerAccount sysPartnerAccount = sysPartnerAccountMapper.selectOne(new LambdaQueryWrapper<SysPartnerAccount>()
|
|
|
+ .eq(SysPartnerAccount::getUserId, sysPremiumDetails2.getUserId()));
|
|
|
+
|
|
|
+ BigDecimal extractFee = sysPremiumDetails1.stream()
|
|
|
+ .map(SysPremiumDetails::getExtractFee)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ if (sysPartnerAccount == null) {
|
|
|
+ SysPartnerAccount sysPartnerAccount1 = new SysPartnerAccount();
|
|
|
+
|
|
|
+ sysPartnerAccount1.setCreateTime(new Date());
|
|
|
+ sysPartnerAccount1.setSumPremium(sysPremiumDetails2.getSumpremium());
|
|
|
+ sysPartnerAccount1.setExtractFee(extractFee);
|
|
|
+ sysPartnerAccount1.setCashFee(extractFee);
|
|
|
+ sysPartnerAccount1.setUserId(sysPremiumDetails2.getUserId());
|
|
|
+ sysPartnerAccountMapper.insert(sysPartnerAccount1);
|
|
|
+ } else {
|
|
|
+ sysPartnerAccount.setSumPremium(sysPartnerAccount.getSumPremium()
|
|
|
+ .add(sysPremiumDetails2.getSumpremium()));
|
|
|
+ sysPartnerAccount.setExtractFee(sysPartnerAccount.getExtractFee().add(extractFee));
|
|
|
+ sysPartnerAccount.setCashFee(sysPartnerAccount.getCashFee().add(extractFee));
|
|
|
+ sysPartnerAccountMapper.updateById(sysPartnerAccount);
|
|
|
+ }
|
|
|
|
|
|
- SysPremiumDetails sysPremiumDetails2 = sysPremiumDetails1.get(0);
|
|
|
+ } else {
|
|
|
+ for (SysPremiumDetails sysPremiumDetail : sysPremiumDetails1) {
|
|
|
SysPartnerAccount sysPartnerAccount = sysPartnerAccountMapper.selectOne(new LambdaQueryWrapper<SysPartnerAccount>()
|
|
|
- .eq(SysPartnerAccount::getUserId,sysPremiumDetails2.getUserId()));
|
|
|
-
|
|
|
- BigDecimal extractFee = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ .eq(SysPartnerAccount::getUserId, sysPremiumDetail.getUserId()));
|
|
|
if (sysPartnerAccount == null) {
|
|
|
SysPartnerAccount sysPartnerAccount1 = new SysPartnerAccount();
|
|
|
-
|
|
|
sysPartnerAccount1.setCreateTime(new Date());
|
|
|
- sysPartnerAccount1.setSumPremium(sysPremiumDetails2.getSumpremium());
|
|
|
- sysPartnerAccount1.setExtractFee(extractFee);
|
|
|
- sysPartnerAccount1.setCashFee(extractFee);
|
|
|
- sysPartnerAccount1.setUserId(sysPremiumDetails2.getUserId());
|
|
|
+ sysPartnerAccount1.setSumPremium(sysPremiumDetail.getSumpremium());
|
|
|
+ sysPartnerAccount1.setExtractFee(sysPremiumDetail.getExtractFee());
|
|
|
+ sysPartnerAccount1.setCashFee(sysPremiumDetail.getExtractFee());
|
|
|
+ sysPartnerAccount1.setUserId(sysPremiumDetail.getUserId());
|
|
|
sysPartnerAccountMapper.insert(sysPartnerAccount1);
|
|
|
- }else {
|
|
|
- sysPartnerAccount.setSumPremium(sysPartnerAccount.getSumPremium().add(sysPremiumDetails2.getSumpremium()));
|
|
|
- sysPartnerAccount.setExtractFee(sysPartnerAccount.getExtractFee().add(extractFee));
|
|
|
- sysPartnerAccount.setCashFee(sysPartnerAccount.getCashFee().add(extractFee));
|
|
|
+ } else {
|
|
|
+ sysPartnerAccount.setSumPremium(sysPartnerAccount.getSumPremium()
|
|
|
+ .add(sysPremiumDetail.getSumpremium()));
|
|
|
+ sysPartnerAccount.setExtractFee(sysPartnerAccount.getExtractFee()
|
|
|
+ .add(sysPremiumDetail.getExtractFee()));
|
|
|
+ sysPartnerAccount.setCashFee(sysPartnerAccount.getCashFee()
|
|
|
+ .add(sysPremiumDetail.getExtractFee()));
|
|
|
sysPartnerAccountMapper.updateById(sysPartnerAccount);
|
|
|
}
|
|
|
-
|
|
|
- }else {
|
|
|
- for (SysPremiumDetails sysPremiumDetail : sysPremiumDetails1) {
|
|
|
- SysPartnerAccount sysPartnerAccount = sysPartnerAccountMapper.selectOne(new LambdaQueryWrapper<SysPartnerAccount>()
|
|
|
- .eq(SysPartnerAccount::getUserId,sysPremiumDetail.getUserId()));
|
|
|
- if (sysPartnerAccount == null) {
|
|
|
- SysPartnerAccount sysPartnerAccount1 = new SysPartnerAccount();
|
|
|
- sysPartnerAccount1.setCreateTime(new Date());
|
|
|
- sysPartnerAccount1.setSumPremium(sysPremiumDetail.getSumpremium());
|
|
|
- sysPartnerAccount1.setExtractFee(sysPremiumDetail.getExtractFee());
|
|
|
- sysPartnerAccount1.setCashFee(sysPremiumDetail.getExtractFee());
|
|
|
- sysPartnerAccount1.setUserId(sysPremiumDetail.getUserId());
|
|
|
- sysPartnerAccountMapper.insert(sysPartnerAccount1);
|
|
|
- }else {
|
|
|
- sysPartnerAccount.setSumPremium(sysPartnerAccount.getSumPremium().add(sysPremiumDetail.getSumpremium()));
|
|
|
- sysPartnerAccount.setExtractFee(sysPartnerAccount.getExtractFee().add(sysPremiumDetail.getExtractFee()));
|
|
|
- sysPartnerAccount.setCashFee(sysPartnerAccount.getCashFee().add(sysPremiumDetail.getExtractFee()));
|
|
|
- sysPartnerAccountMapper.updateById(sysPartnerAccount);
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|
|
|
sysPremiumDetailsMapper.updateStatus(insAreaCompany.getId());
|
|
|
- if (isManagement(order.getUserid()) && sysSwitchConfigService.getBalanceExtractStatus()){
|
|
|
+ if (isManagement(order.getUserid()) && sysSwitchConfigService.getBalanceExtractStatus()) {
|
|
|
dataServerService.sendLgDataServer(insOrderNo);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -428,7 +438,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
|
|
|
public boolean isManagement(String userId) {
|
|
|
SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
|
|
|
- if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())){
|
|
|
+ if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())) {
|
|
|
return true;
|
|
|
}
|
|
|
return false;
|
|
|
@@ -597,9 +607,11 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
if (!ObjectUtils.isEmpty(insFeeOrder)) {
|
|
|
insPlyIncome.setNoTaxPremium(insFeeOrder.getJqNoTaxPremium());
|
|
|
insPlyIncome.setCommissionFeerate(insFeeOrder.getJqSuperviseCostsProportion());
|
|
|
- insPlyIncome.setOtherFeerate(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion()));
|
|
|
+ insPlyIncome.setOtherFeerate(insFeeOrder.getJqCostsProportion()
|
|
|
+ .subtract(insFeeOrder.getJqSuperviseCostsProportion()));
|
|
|
insPlyIncome.setCommissionFeevalue(insFeeOrder.getJqSuperviseCostsPremiums());
|
|
|
- insPlyIncome.setOtherFeevalue(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums()));
|
|
|
+ insPlyIncome.setOtherFeevalue(insFeeOrder.getJqCostsPremiums()
|
|
|
+ .subtract(insFeeOrder.getJqSuperviseCostsPremiums()));
|
|
|
insPlyIncome.setAllFeeValue(insFeeOrder.getJqCostsPremiums());
|
|
|
}
|
|
|
insPlyIncomeMapper.insert(insPlyIncome);
|
|
|
@@ -611,9 +623,11 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
if (!ObjectUtils.isEmpty(insFeeOrder)) {
|
|
|
insPlyIncome.setNoTaxPremium(insFeeOrder.getSyNoTaxPremium());
|
|
|
insPlyIncome.setCommissionFeerate(insFeeOrder.getSySuperviseCostsProportion());
|
|
|
- insPlyIncome.setOtherFeerate(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion()));
|
|
|
+ insPlyIncome.setOtherFeerate(insFeeOrder.getSyCostsProportion()
|
|
|
+ .subtract(insFeeOrder.getSySuperviseCostsProportion()));
|
|
|
insPlyIncome.setCommissionFeevalue(insFeeOrder.getSySuperviseCostsPremiums());
|
|
|
- insPlyIncome.setOtherFeevalue(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums()));
|
|
|
+ insPlyIncome.setOtherFeevalue(insFeeOrder.getSyCostsPremiums()
|
|
|
+ .subtract(insFeeOrder.getSySuperviseCostsPremiums()));
|
|
|
insPlyIncome.setAllFeeValue(insFeeOrder.getSyCostsPremiums());
|
|
|
}
|
|
|
insPlyIncomeMapper.insert(insPlyIncome);
|
|
|
@@ -751,7 +765,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("交强");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getThirdRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getThirdRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getThirdRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(plyDto.getSypolicyno())) {
|
|
|
@@ -759,7 +776,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("商业");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getThirdRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getThirdRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getThirdRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
|
|
|
@@ -788,7 +808,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("交强");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getSecondRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getSecondRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(plyDto.getSypolicyno())) {
|
|
|
@@ -796,7 +819,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("商业");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getSecondRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getSecondRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
}
|
|
|
@@ -824,7 +850,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("交强");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getFirstRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getJqNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getFirstRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
if (StringUtils.isNotEmpty(plyDto.getSypolicyno())) {
|
|
|
@@ -832,7 +861,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
commission.setRiskcode("商业");
|
|
|
commission.setLicenseno(order.getLicenseno());
|
|
|
commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue());
|
|
|
- commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getFirstRetailProportion()).divide(new BigDecimal(100)).doubleValue());
|
|
|
+ commission.setCommissionamount(insFeeOrder.getSyNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getFirstRetailProportion())
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .doubleValue());
|
|
|
insCommissionService.insert(commission);
|
|
|
}
|
|
|
}
|
|
|
@@ -878,8 +910,15 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
insCompanyFee.setPolicyno(plyDto.getJqpolicyno());
|
|
|
insCompanyFee.setRiskcode("交强");
|
|
|
//交强费用比例=交强险费用比例-五级机构管理费比例-三级分销比例
|
|
|
- insCompanyFee.setFeerate(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
|
|
|
- insCompanyFee.setFeeamount(insFeeOrder.getJqNoTaxPremium().multiply(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
+ insCompanyFee.setFeerate(insFeeOrder.getJqCostsProportion()
|
|
|
+ .subtract(dept_rate)
|
|
|
+ .subtract(retail_rate)
|
|
|
+ .doubleValue());
|
|
|
+ insCompanyFee.setFeeamount(insFeeOrder.getJqNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getJqCostsProportion().subtract(dept_rate).subtract(retail_rate))
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .setScale(2, BigDecimal.ROUND_HALF_UP)
|
|
|
+ .doubleValue());
|
|
|
insCompanyFee.setJqpremium(insFeeOrder.getJqNoTaxPremium().doubleValue());
|
|
|
//保存业务员费用
|
|
|
insCompanyFeeService.insert(insCompanyFee);
|
|
|
@@ -891,8 +930,15 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
|
|
|
insCompanyFee.setFeeamount(0);
|
|
|
insCompanyFee.setJqpremium(0);
|
|
|
//商业费用比例=商业险费用比例-五级机构管理费比例-三级分销比例
|
|
|
- insCompanyFee.setDisrate(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate).doubleValue());
|
|
|
- insCompanyFee.setDisamount(insFeeOrder.getSyNoTaxPremium().multiply(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate)).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
+ insCompanyFee.setDisrate(insFeeOrder.getSyCostsProportion()
|
|
|
+ .subtract(dept_rate)
|
|
|
+ .subtract(retail_rate)
|
|
|
+ .doubleValue());
|
|
|
+ insCompanyFee.setDisamount(insFeeOrder.getSyNoTaxPremium()
|
|
|
+ .multiply(insFeeOrder.getSyCostsProportion().subtract(dept_rate).subtract(retail_rate))
|
|
|
+ .divide(new BigDecimal(100))
|
|
|
+ .setScale(2, BigDecimal.ROUND_HALF_UP)
|
|
|
+ .doubleValue());
|
|
|
insCompanyFee.setSypremium(insFeeOrder.getSyNoTaxPremium().doubleValue());
|
|
|
//保存业务员费用
|
|
|
insCompanyFeeService.insert(insCompanyFee);
|