工作室保费

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1248,15 +1248,21 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 appSysPartnerVo.setLeaderIds(list1);
                 //直接工作室保费
                 List<SysPremiumDetails> sysPremiumDetails1 = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                        .in(CollectionUtil.isNotEmpty(ids), SysPremiumDetails::getUserId, list1)
+                        .in(CollectionUtil.isNotEmpty(list1), SysPremiumDetails::getUserId, list1)
                         .between(StringUtils.isNotEmpty(partnerInfoDto.getBeginTime()) && StringUtils.isNotEmpty(partnerInfoDto.getEndTime()),
                                 SysPremiumDetails::getCreateTime, partnerInfoDto.getBeginTime(), partnerInfoDto.getEndTime())
                         .eq(partnerInfoDto.getIndustrySector() != null, SysPremiumDetails::getIndustrySector, partnerInfoDto.getIndustrySector()));
-                BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+                if (sysPremiumDetails1 != null) {
 
-                appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
-                appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
+                    BigDecimal sumPremium1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getSumpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    BigDecimal extractFee1 = sysPremiumDetails1.stream().map(SysPremiumDetails::getExtractFee).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                    appSysPartnerVo.setSumPremium(sumPremium.add(sumPremium1));
+                    appSysPartnerVo.setExtractFee(extractFee.add(extractFee1));
+                }else {
+                    appSysPartnerVo.setSumPremium(sumPremium);
+                    appSysPartnerVo.setExtractFee(extractFee);
+                }
                 int leaderManNum=0;
                 //直接工作室总
                 List<SysAgencyLeader> leaderList = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -299,25 +299,29 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 SysAgencyLeader sysAgencyLeader = sysAgencyLeaderMapper.selectOne(new LambdaQueryWrapper<SysAgencyLeader>()
                         .eq(SysAgencyLeader::getDeptId, deptId).eq(SysAgencyLeader::getDelFlag,1));
                 if (sysAgencyLeader != null) {
-                    SysPremiumDetails sysPremiumDetails = new SysPremiumDetails();
-                    sysPremiumDetails.setUserId(sysAgencyLeader.getUserId());
-                    sysPremiumDetails.setUserName(sysAgencyLeader.getUserName());
-                    sysPremiumDetails.setCompanyId(insAreaCompany.getId());
-                    sysPremiumDetails.setOrderno(insAreaCompany.getOrderno());
-                    sysPremiumDetails.setJqpremium(insAreaCompany.getJqpremium());
-                    sysPremiumDetails.setJypremium(insAreaCompany.getJypremium());
-                    sysPremiumDetails.setSypremium(insAreaCompany.getSypremium());
-                    sysPremiumDetails.setSumpremium(insAreaCompany.getJqpremium().add(insAreaCompany.getJypremium()).add(insAreaCompany.getSypremium()));
-                    sysPremiumDetails.setProportional(sysAgencyLeader.getProportional());
-                    sysPremiumDetails.setStatus(0);
-                    sysPremiumDetails.setType(2);
-                    sysPremiumDetails.setIssuerId(userId);
-                    sysPremiumDetails.setIssuerName(insOrders.getUsername());
-                    sysPremiumDetails.setExtractFee(sysPremiumDetails.getSumpremium().multiply(new BigDecimal(sysAgencyLeader.getProportional())
-                            .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
-                    sysPremiumDetails.setCreateTime(new Date());
-                    sysPremiumDetails.setIndustrySector(1);
-                    sysPremiumDetailsMapper.insert(sysPremiumDetails);
+                    //工作室分钱
+                    String proportional = sysAgencyLeader.getProportional();
+                    if (proportional != null) {
+                        SysPremiumDetails sysPremiumDetails = new SysPremiumDetails();
+                        sysPremiumDetails.setUserId(sysAgencyLeader.getUserId());
+                        sysPremiumDetails.setUserName(sysAgencyLeader.getUserName());
+                        sysPremiumDetails.setCompanyId(insAreaCompany.getId());
+                        sysPremiumDetails.setOrderno(insAreaCompany.getOrderno());
+                        sysPremiumDetails.setJqpremium(insAreaCompany.getJqpremium());
+                        sysPremiumDetails.setJypremium(insAreaCompany.getJypremium());
+                        sysPremiumDetails.setSypremium(insAreaCompany.getSypremium());
+                        sysPremiumDetails.setSumpremium(insAreaCompany.getJqpremium().add(insAreaCompany.getJypremium()).add(insAreaCompany.getSypremium()));
+                        sysPremiumDetails.setProportional(sysAgencyLeader.getProportional());
+                        sysPremiumDetails.setStatus(0);
+                        sysPremiumDetails.setType(2);
+                        sysPremiumDetails.setIssuerId(userId);
+                        sysPremiumDetails.setIssuerName(insOrders.getUsername());
+                        sysPremiumDetails.setExtractFee(sysPremiumDetails.getSumpremium().multiply(new BigDecimal(sysAgencyLeader.getProportional())
+                                .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
+                        sysPremiumDetails.setCreateTime(new Date());
+                        sysPremiumDetails.setIndustrySector(1);
+                        sysPremiumDetailsMapper.insert(sysPremiumDetails);
+                    }
                     //查询一级合伙人的比例配置
                     SysRelationPerson sysRelationPerson1 = sysRelationPersonMapper.selectOne(new LambdaQueryWrapper<SysRelationPerson>()
                             .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader.getUserId())