|
|
@@ -40,6 +40,7 @@ import com.jzg.organization.excel.listener.*;
|
|
|
import com.jzg.organization.mapper.*;
|
|
|
import com.jzg.organization.service.ReceivableService;
|
|
|
import com.jzg.organization.service.SysUserJzgInfoSalesmanService;
|
|
|
+import org.apache.ibatis.annotations.Param;
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
import org.redisson.api.RBucket;
|
|
|
import org.redisson.api.RKeys;
|
|
|
@@ -240,6 +241,17 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 查询应收总额
|
|
|
+ *
|
|
|
+ * @author lipf
|
|
|
+ * @date 2026/6/4 10:22
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public BigDecimal queryAllTotalReceivablePremiumByOrderNo(@Param("orders") List<String> orders){
|
|
|
+ return baseMapper.queryAllTotalReceivablePremiumByOrderNo(orders);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 应收数据二次过滤
|
|
|
*
|
|
|
@@ -1502,7 +1514,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
*/
|
|
|
@Override
|
|
|
public BigDecimal queryAllTotalReceivablePremium(List<String> orderNos) {
|
|
|
- return insFeeOrdersClient.queryAllTotalReceivablePremiumByOrderNo(orderNos);
|
|
|
+ return this.queryAllTotalReceivablePremiumByOrderNo(orderNos);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -2174,18 +2186,22 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// modify by lipf 2026年6月18日09:36:01 转换为百分比
|
|
|
BigDecimal jqSuperviseCostsProportion = BigDecimalUtil.divide(batchModifyVo.getJqSuperviseCostsProportion(), new BigDecimal(100)) ;
|
|
|
BigDecimal superviseReceivablePremium = BigDecimalUtil.divide(BigDecimalUtil.multiply(new BigDecimal(Objects.toString(insPlyIncomeSource.getJqPremium(),"0") ), jqSuperviseCostsProportion), taxRate) ;
|
|
|
+ BigDecimal jqReceivePremiun = BigDecimalUtil.add(superviseReceivablePremium, BigDecimalUtil.toZero(insPlyIncomeSource.getInsFeeOrders() == null? null: insPlyIncomeSource.getInsFeeOrders().getJqFollowPremium()));
|
|
|
baseMapper.update(null, new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.set(InsPlyIncome::getJqSuperviseCostsProportion, jqSuperviseCostsProportion)
|
|
|
.set(InsPlyIncome::getJqSuperviseCostsPremiums, superviseReceivablePremium)
|
|
|
+ .set(InsPlyIncome::getJqReceivablePremium,jqReceivePremiun)
|
|
|
.in(InsPlyIncome::getId, batchModifyVo.getIncomeIds()));
|
|
|
}
|
|
|
if (Objects.nonNull(batchModifyVo.getSySuperviseCostsProportion()) && batchModifyVo.getSySuperviseCostsProportion().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
// modify by lipf 2026年6月18日09:36:01 转换为百分比
|
|
|
BigDecimal sySuperviseCostsProportion = BigDecimalUtil.divide(batchModifyVo.getSySuperviseCostsProportion(), new BigDecimal(100)) ;
|
|
|
- BigDecimal otherReceivablePremium = BigDecimalUtil.divide(BigDecimalUtil.multiply(new BigDecimal(Objects.toString(insPlyIncomeSource.getSyPremium(),"0")), sySuperviseCostsProportion), taxRate) ;
|
|
|
+ BigDecimal sySuperviseReceivablePremium = BigDecimalUtil.divide(BigDecimalUtil.multiply(new BigDecimal(Objects.toString(insPlyIncomeSource.getSyPremium(),"0")), sySuperviseCostsProportion), taxRate) ;
|
|
|
+ BigDecimal syReceivePremiun = BigDecimalUtil.add(sySuperviseReceivablePremium, BigDecimalUtil.toZero(insPlyIncomeSource.getInsFeeOrders() != null? insPlyIncomeSource.getInsFeeOrders().getSyFollowPremium() : null));
|
|
|
baseMapper.update(null, new LambdaUpdateWrapper<InsPlyIncome>()
|
|
|
.set(InsPlyIncome::getSySuperviseCostsProportion, sySuperviseCostsProportion)
|
|
|
- .set(InsPlyIncome::getSySuperviseCostsPremiums, otherReceivablePremium)
|
|
|
+ .set(InsPlyIncome::getSySuperviseCostsPremiums, sySuperviseReceivablePremium)
|
|
|
+ .set(InsPlyIncome::getSyReceivablePremium,syReceivePremiun)
|
|
|
.in(InsPlyIncome::getId, batchModifyVo.getIncomeIds()));
|
|
|
}
|
|
|
if (batchModifyVo.getSigningTime() != null){
|