合伙人外部订单问题

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

@@ -22,6 +22,7 @@ import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.utils.ObjectUtil;
 import com.ydtech.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -417,7 +418,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
         List<SysAgencyLeader> records = insOrdersPage.getRecords();
         List<SysAgencyLeaderVo> sysAgencyLeaderVos = BeanUtil.copyToList(records, SysAgencyLeaderVo.class);
-        if (sysAgencyLeaderVos.size() > 0) {
+        if (!sysAgencyLeaderVos.isEmpty()) {
             for (SysAgencyLeaderVo sysAgencyLeaderVo : sysAgencyLeaderVos) {
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getId, sysAgencyLeaderVo.getDeptId()).eq(SysDept::getDelFlag, 0));
                 if (sysDept != null) {
@@ -425,7 +426,9 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
                     sysAgencyLeaderVo.setDeptName(sysDept.getName());
                 }
                 SysUser sysUser = sysUserMapper.selectById(sysAgencyLeaderVo.getUserId());
-                sysAgencyLeaderVo.setUserName(sysUser.getName());
+                if(!Objects.isNull(sysUser)) {
+                    sysAgencyLeaderVo.setUserName(sysUser.getName());
+                }
             }
         }
 

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

@@ -131,15 +131,17 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
         List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
 
-        if (sysUserPartners.size() > 0) {
+        if (!sysUserPartners.isEmpty()) {
             for (SysUserPartner user : sysUserPartners) {
                 SysUser sysUser1 = sysUserMapper.selectById(user.getUserId());
-                user.setUserName(sysUser1.getName());
-                user.setDeptId(sysUser1.getDeptId());
-                SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
-                        .eq(SysDept::getId, sysUser1.getDeptId()).eq(SysDept::getDelFlag, 0));
-                user.setParentId(sysDept.getParentId());
-                user.setDeptName(sysDept.getName());
+                if(!Objects.isNull(sysUser1)) {
+                    user.setUserName(sysUser1.getName());
+                    user.setDeptId(sysUser1.getDeptId());
+                    SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                            .eq(SysDept::getId, sysUser1.getDeptId()).eq(SysDept::getDelFlag, 0));
+                    user.setParentId(sysDept.getParentId());
+                    user.setDeptName(sysDept.getName());
+                }
                 SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>()
                         .eq(SysPartner::getUserId, user.getUserId()));
                 if (sysPartner != null) {

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

@@ -37,6 +37,7 @@ import com.ydtech.modules.lg.service.PushLgDataServerService;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
+import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
@@ -137,6 +138,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     private PushLgDataServerService dataServerService;
 
     private ExecutorService executorService= Executors.newCachedThreadPool();
+    @Autowired
+    private InsOrdersService insOrdersService;
 
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper,
@@ -178,7 +181,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
             //InsOrders order = insOrdersMapper.selectById(orderNo);
             InsAreaCompany insAreaCompany = insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
-
             //获取该订单的费用
             InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                     .eq(InsFeeOrderNew::getInsOrderNo, insFeeAudit.getInsOrderNo()));
@@ -335,12 +337,21 @@ 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.size()>0) {
+
+            if (sysPremiumDetails.isEmpty() && order.getIsExternal() == 1) {
+                //已承保记录保费数据
+                com.ydtech.modules.order.entity.InsAreaCompany insAreaCompany1 = new com.ydtech.modules.order.entity.InsAreaCompany();
+                BeanUtils.copyProperties(insAreaCompany, insAreaCompany1);
+                insOrdersService.saveFeeInfo(insAreaCompany1);
+            }
+
+            if (!sysPremiumDetails.isEmpty()) {
 
                 Map<String, List<SysPremiumDetails>> listMap = sysPremiumDetails.stream().sorted(Comparator.comparing(SysPremiumDetails::getId))
                         .collect(Collectors.groupingBy(SysPremiumDetails::getUserId));

src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -54,6 +54,12 @@ public interface InsOrdersService extends IService<InsOrders> {
      */
     void updateByOrderStatus(InsAreaCompany insAreaCompany);
 
+    /**
+     * 合伙人插入钱逻辑
+     * @param insAreaCompany
+     */
+    void saveFeeInfo(InsAreaCompany insAreaCompany);
+
     /**
      * 判断订单是否存在
      *

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

@@ -262,7 +262,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             String id = insAreaCompany.getId();
             if (StringUtils.isNotEmpty(id)) {
                 List<SysPremiumDetails> sysPremiumDetails = sysPremiumDetailsMapper.selectList(new LambdaQueryWrapper<SysPremiumDetails>().eq(SysPremiumDetails::getCompanyId, id));
-                if ( sysPremiumDetails.size() == 0) {
+                if (sysPremiumDetails.isEmpty()) {
                     //已承保记录保费数据
                     saveFeeInfo(insAreaCompany);
                 }
@@ -281,7 +281,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     }
 
-    private void saveFeeInfo(InsAreaCompany insAreaCompany) {
+    @Override
+    public void saveFeeInfo(InsAreaCompany insAreaCompany) {
         InsOrders insOrders = getById(insAreaCompany.getOrderno());
         String userId = insOrders.getUserid();
         try {