工作室编辑

src/main/java/com/ydtech/modules/admin/service/SysAgencyLeaderService.java

@@ -32,7 +32,7 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
 
     boolean edit(SysAgencyLeaderDto sysAgencyLeaderDto);
     boolean editAll(List<SysAgencyLeaderDto> sysAgencyLeaderDto);
-    boolean editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto);
+    void editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto);
 
     boolean delById(Integer id);
 

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

@@ -241,7 +241,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto) {
+    public void editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto) {
         SysDept sysDept = sysAgencyLeaderDeptDto.getSysDept();
         SysDept byId = sysDeptService.getById(sysDept.getId());
         if (sysDept.getManagementSource() != null){
@@ -251,37 +251,42 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         }
         sysDeptService.updateDept(sysDept);
 
-        //不修改负责人userId传null
-        String userId = sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId();
-        String loginId = BaseController.getUserId();
-        SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeaderDeptDto.getSysAgencyLeader().getId());
-        //修改管理员
-        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
-        List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-        if (userIdList.contains(userId)) {
-            throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是工作室管理员，不可重复配置");
-        }
-        List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
-        if (sysPartners.size() > 0) {
-            List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-            if (list.contains(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId())) {
-                throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是合伙人，不可设置为机构负责人");
+        SysAgencyLeader sysAgencyLeader2 = sysAgencyLeaderDeptDto.getSysAgencyLeader();
+        if (sysAgencyLeader2 != null) {
+            //不修改负责人userId传null
+            String userId = sysAgencyLeader2.getUserId();
+            String loginId = BaseController.getUserId();
+            SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeader2.getId());
+
+            //修改管理员
+            List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>()
+                    .lambda().eq(SysAgencyLeader::getDelFlag, 1));
+            List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
+            if (userIdList.contains(userId)) {
+                throw new DescribeException(sysAgencyLeader2.getUserName() + "已是工作室管理员，不可重复配置");
+            }
+            List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
+            if (sysPartners.size() > 0) {
+                List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+                if (list.contains(sysAgencyLeader2.getUserId())) {
+                    throw new DescribeException(sysAgencyLeader2.getUserName() + "已是合伙人，不可设置为机构负责人");
+                }
             }
-        }
 
-        //修改负责人时解除合伙人或者推荐人与机构负责人的关系
-        List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
-                .eq(SysRelationPerson::getDelFlag, 1)
-                .eq(SysRelationPerson::getType, 1));
-        if (sysRelationPeople.size() > 0) {
-            throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
-        }
+            //修改负责人时解除合伙人或者推荐人与机构负责人的关系
+            List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                    .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
+                    .eq(SysRelationPerson::getDelFlag, 1)
+                    .eq(SysRelationPerson::getType, 1));
+            if (sysRelationPeople.size() > 0) {
+                throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
+            }
 
-        SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDeptDto.getSysAgencyLeader(), SysAgencyLeader.class);
-        sysAgencyLeader.setUpdateTime(new Date());
-        sysAgencyLeader.setUpdateBy(loginId);
-        return sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
+            SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeader2, SysAgencyLeader.class);
+            sysAgencyLeader.setUpdateTime(new Date());
+            sysAgencyLeader.setUpdateBy(loginId);
+            sysAgencyLeaderMapper.updateById(sysAgencyLeader);
+        }
     }
 
     @Override

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

@@ -257,8 +257,26 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrders.setInsCompany(insAreaCompany.getInscompany());
             insOrders.setInsureTime(insAreaCompany.getPayDate());
             //已承保记录保费数据
-            String userId = insOrders.getUserid();
+            saveFeeInfo(insAreaCompany);
 
+        }
+
+        if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
+            return;
+        }
+
+        insOrders.setOrderstatus(orderStatus);
+        LambdaQueryWrapper<InsOrders> insOrdersLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        insOrdersLambdaQueryWrapper.ne(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
+        insOrdersLambdaQueryWrapper.eq(InsOrders::getOrderno, insAreaCompany.getOrderno());
+        update(insOrders, insOrdersLambdaQueryWrapper);
+
+    }
+
+    private void saveFeeInfo(InsAreaCompany insAreaCompany) {
+        InsOrders insOrders = getById(insAreaCompany.getOrderno());
+        String userId = insOrders.getUserid();
+        try {
             SysDept sysDept = sysDeptService.getById(insOrders.getDeptid());
             if (sysDept != null) {
                 SysPremiumDetails sysPremiumDetailsInfo = new SysPremiumDetails();
@@ -353,26 +371,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                                 sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysProportionConfig.getFiveProportion())
                                         .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             }
-//                            sysPremiumDetail.setProportional(sysPartner.getProportional());
-//                            sysPremiumDetail.setExtractFee(sysPremiumDetail.getSumpremium().multiply(new BigDecimal(sysPartner.getProportional())
-//                                    .divide(new BigDecimal("100"))).setScale(5, RoundingMode.DOWN));
                             sysPremiumDetailsMapper.insert(sysPremiumDetail);
                         }
                     }
                 }
             }
-        }
+        }catch (Exception e){
 
-        if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insOrders.getOrderstatus())) {
-            return;
         }
 
-        insOrders.setOrderstatus(orderStatus);
-        LambdaQueryWrapper<InsOrders> insOrdersLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        insOrdersLambdaQueryWrapper.ne(InsOrders::getOrderstatus, InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());
-        insOrdersLambdaQueryWrapper.eq(InsOrders::getOrderno, insAreaCompany.getOrderno());
-        update(insOrders, insOrdersLambdaQueryWrapper);
-
     }
 
     private String getFiveDeptId(SysDept sysDept) {