App合伙人费用展示

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

@@ -404,36 +404,52 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                             .eq(SysAgencyLeader::getDelFlag, 1));
                     if (sysAgencyLeaders != null) {
                         agencyExtractFee.setProportional(sysPartner.getProportional());
-                        List<InsOrders> insOrderList;
                         //筛选订单，选择时间
                         Date updateTime = sysAgencyLeaders.getUpdateTime();
-                        if (updateTime == null) {
-                            //机构下所有订单
-                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                                    .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-                            agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-                        } else {
-                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                                    .ge(InsOrders::getCreatetime, updateTime));
+                        Date createTime = sysAgencyLeaders.getCreateTime();
+                        String dateStr = "";
+                        if (updateTime != null) {
+                            dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
                             agencyExtractFee.setStartTime(updateTime);
+                        } else {
+                            dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                            agencyExtractFee.setStartTime(createTime);
                         }
-                        if (insOrderList.size() > 0) {
-                            List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                            //查询订单下的所有子订单
-                            List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                                    .in(InsAreaCompany::getOrderno, collect)
-                                    .eq(InsAreaCompany::getOrderstatus, 3));
-                            if (insAreaCompanies.size() > 0) {
-                                //累加每一个子订单的交强险费用+商业险费用+驾意险费用
-                                BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                                BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                                bigDecimal = jqpremium.add(sypremium).add(jypremium);
-                            }
+                        HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
+                        if (CollectionUtil.isNotEmpty(map)) {
+                            bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                         }
+
+//                        List<InsOrders> insOrderList;
+//                        //筛选订单，选择时间
+//                        Date updateTime = sysAgencyLeaders.getUpdateTime();
+//                        if (updateTime == null) {
+//                            //机构下所有订单
+//                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
+//                                    .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
+//                            agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
+//                        } else {
+//                            insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                                    .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
+//                                    .ge(InsOrders::getCreatetime, updateTime));
+//                            agencyExtractFee.setStartTime(updateTime);
+//                        }
+//                        if (insOrderList.size() > 0) {
+//                            List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
+//                            //查询订单下的所有子订单
+//                            List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
+//                                    .in(InsAreaCompany::getOrderno, collect)
+//                                    .eq(InsAreaCompany::getOrderstatus, 3));
+//                            if (insAreaCompanies.size() > 0) {
+//                                //累加每一个子订单的交强险费用+商业险费用+驾意险费用
+//                                BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+//                                bigDecimal = jqpremium.add(sypremium).add(jypremium);
+//                            }
+//                        }
                     }
                 }
                 agencyExtractFee.setSumpremium(bigDecimal);
@@ -485,35 +501,52 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 BigDecimal historyFee = new BigDecimal("0.00");
 
                 agencyExtractFee.setProportional(sysAgencyLeaders.getProportional());
-                List<InsOrders> insOrderList;
+
                 //筛选订单，选择时间
                 Date updateTime = sysAgencyLeaders.getUpdateTime();
-                if (updateTime == null) {
-                    //机构下所有订单
-                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                            .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
-                    agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
-                } else {
-                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
-                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
-                            .ge(InsOrders::getCreatetime, updateTime));
+                Date createTime = sysAgencyLeaders.getCreateTime();
+                String dateStr = "";
+                if (updateTime != null) {
+                    dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(updateTime);
                     agencyExtractFee.setStartTime(updateTime);
+                } else {
+                    dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(createTime);
+                    agencyExtractFee.setStartTime(createTime);
                 }
-                if (insOrderList.size() > 0) {
-                    List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
-                    //查询订单下的所有子订单
-                    List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
-                            .in(InsAreaCompany::getOrderno, collect)
-                            .eq(InsAreaCompany::getOrderstatus, 3));
-                    if (insAreaCompanies.size() > 0) {
-                        BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
-
-                        bigDecimal = jqpremium.add(sypremium).add(jypremium);
-                    }
+                HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
+                if (CollectionUtil.isNotEmpty(map)) {
+                    bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                 }
+
+//                List<InsOrders> insOrderList;
+//                //筛选订单，选择时间
+//                Date updateTime = sysAgencyLeaders.getUpdateTime();
+//                if (updateTime == null) {
+//                    //机构下所有订单
+//                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
+//                            .ge(InsOrders::getCreatetime, sysAgencyLeaders.getCreateTime()));
+//                    agencyExtractFee.setStartTime(sysAgencyLeaders.getCreateTime());
+//                } else {
+//                    insOrderList = insOrdersMapper.selectList(new LambdaQueryWrapper<InsOrders>()
+//                            .likeRight(StringUtils.isNotEmpty(sysAgencyLeaders.getDeptId()), InsOrders::getDeptid, sysAgencyLeaders.getDeptId())
+//                            .ge(InsOrders::getCreatetime, updateTime));
+//                    agencyExtractFee.setStartTime(updateTime);
+//                }
+//                if (insOrderList.size() > 0) {
+//                    List<String> collect = insOrderList.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
+//                    //查询订单下的所有子订单
+//                    List<InsAreaCompany> insAreaCompanies = insAreaCompanyMapper.selectList(new LambdaQueryWrapper<InsAreaCompany>()
+//                            .in(InsAreaCompany::getOrderno, collect)
+//                            .eq(InsAreaCompany::getOrderstatus, 3));
+//                    if (insAreaCompanies.size() > 0) {
+//                        BigDecimal jqpremium = insAreaCompanies.stream().map(InsAreaCompany::getJqpremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                        BigDecimal sypremium = insAreaCompanies.stream().map(InsAreaCompany::getSypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                        BigDecimal jypremium = insAreaCompanies.stream().map(InsAreaCompany::getJypremium).reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+//                        bigDecimal = jqpremium.add(sypremium).add(jypremium);
+//                    }
+//                }
                 agencyExtractFee.setSumpremium(bigDecimal);
                 BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
                         .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
@@ -651,8 +684,6 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 AgencyExtractFeeVo agencyExtractFee = new AgencyExtractFeeVo();
                 //总保费
                 BigDecimal bigDecimal = BigDecimal.ZERO;
-                //抽层费用
-                BigDecimal multiply = BigDecimal.ZERO;
                 //已提现抽成费用
                 BigDecimal historyFee = BigDecimal.ZERO;
 
@@ -674,13 +705,13 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                 }
                 HashMap<String, BigDecimal> map = baseMapper.getBigDecimalNum(sysAgencyLeaders.getDeptId(), dateStr,null,null);
                 if (CollectionUtil.isNotEmpty(map)) {
-                    bigDecimal = map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal");
-                    agencyExtractFee.setSumpremium(bigDecimal);
-                    multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
-                            .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
-                    agencyExtractFee.setExtractFee(multiply);
+
                     bigDecimal = bigDecimal.add(map.get("bigDecimal") == null ? BigDecimal.ZERO : map.get("bigDecimal"));
                 }
+                agencyExtractFee.setSumpremium(bigDecimal);
+                BigDecimal multiply = bigDecimal.multiply(new BigDecimal(agencyExtractFee.getProportional())
+                        .divide(new BigDecimal("100"))).setScale(2, RoundingMode.DOWN);
+                agencyExtractFee.setExtractFee(multiply);
                 // 填充 已提现抽成费用和可提现抽成费用
                 List<SysAgencyFeeApproval> sysAgencyFeeApprovals = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
                         .eq(SysAgencyFeeApproval::getUserId, sysAgencyLeaders.getUserId())