合并修改

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -367,81 +367,13 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 sysChannelCostService.updateBatchById(costList);
             }
 
-            //先把钱加到总账户，再修改抽层状态
-            List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>()
-                    .eq(SysPremiumDetails::getCompanyId, insAreaCompany.getId())
-                    .eq(SysPremiumDetails::getType, 2)
-                    .eq(SysPremiumDetails::getStatus, 0));
-
-            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));
+            SysUser sysUser = sysUserService.getById(BaseController.getUserId());
+            if (1 == sysUser.getNewApp()){
+                newExtractFee(insAreaCompany);
+            }else {
+                extractFee(insAreaCompany);
             }
 
-            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);
-                    }
-
-                } 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()) {
                 dataServerService.sendLgDataServer(insOrderNo);