Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -138,7 +138,6 @@ CREATE TABLE `sys_relation_person` (
                                        `del_flag` tinyint NOT NULL DEFAULT '1' COMMENT '删除（ 0：删除 1：正常）',
                                        PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='合伙人/推荐人和机构负责人关系表';
-ALTER TABLE `sys_user_bank_card` ADD COLUMN `ascription` tinyint DEFAULT NULL COMMENT '归属端 1：渠道 2：个代 a:合伙人 b:机构负责人';
 
 --add by caiyaru 20240813
 ALTER TABLE `sys_user_bank_card` ADD COLUMN `bank_verify` tinyint  DEFAULT 0 COMMENT '0 未验证 1 已验证';

src/main/java/com/ydtech/modules/admin/controller/SysAgencyLeaderController.java

@@ -26,14 +26,6 @@ public class SysAgencyLeaderController extends BaseController {
     @Resource
     private SysAgencyLeaderService sysAgencyLeaderService;
 
-//    /**
-//     * 查询正常的后线人员工  id 和姓名
-//     */
-//    @GetMapping("/getUserInfo")
-//    @ApiOperation(value = "查询账号正常的后线人员工")
-//    public HttpResult getUserInfo() {
-//        return HttpResult.ok(sysAgencyLeaderService.getUserInfo());
-//    }
 
     /**
      * 查询四级正常的后线人员

src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -183,16 +183,6 @@ public class SysDeptController extends BaseController {
         return HttpResult.ok(sysDeptService.getSysDeptTree());
     }
 
-    /**
-     * 合伙人、工作室管理机构树
-     * @return
-     */
-    @ApiOperation(value = "合伙人、工作室管理机构树")
-    @GetMapping(value = "/getSysDeptTreeInfo")
-    public HttpResult<List<SysDeptTreeVo>> getSysDeptTreeInfo() {
-
-        return HttpResult.ok(sysDeptService.getSysDeptTreeInfo());
-    }
 
 
 }

src/main/java/com/ydtech/modules/admin/controller/SysPartnerController.java

@@ -2,10 +2,8 @@ package com.ydtech.modules.admin.controller;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysPartner;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysPartnerDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerPageDto;
-import com.ydtech.modules.admin.model.vo.AgencyExtractFee;
 import com.ydtech.modules.admin.model.vo.AgencyExtractFeeVo;
 import com.ydtech.modules.admin.model.vo.SysUserPartner;
 import com.ydtech.modules.admin.service.SysPartnerService;

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

@@ -115,7 +115,6 @@ public interface SysDeptService extends IService<SysDept> {
 
     List<SysDeptTreeVo> getSysDeptTree();
 
-    List<SysDeptTreeVo> getSysDeptTreeInfo();
 }
 
 

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

@@ -583,42 +583,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         return sysDeptTreeVos;
     }
 
-    private void getSysDeptTreeVos(List<SysDeptTreeVo> sysDeptTree1) {
-        for (SysDeptTreeVo deptTreeVo : sysDeptTree1) {
-            List<SysDept> sysDept2 = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
-                    .eq(SysDept::getParentId, deptTreeVo.getId()).eq(SysDept::getDelFlag, 0).isNotNull(SysDept::getComlevel));
-            List<SysDeptTreeVo> sysDeptTree2 = BeanUtil.copyToList(sysDept2, SysDeptTreeVo.class);
-            deptTreeVo.setChildren(sysDeptTree2);
-            if (sysDeptTree2.size()>0) {
-                getSysDeptTreeVos(sysDeptTree2);
-            }
-
-        }
-
-    }
-
-    @Override
-    public List<SysDeptTreeVo> getSysDeptTreeInfo() {
-        SysDept sysDept = getById("9");
-        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysDept::getDelFlag, 0);
-        lqw.isNotNull(SysDept::getComlevel);
-        lqw.likeRight(SysDept::getId, "9");
-        lqw.orderByAsc(SysDept::getOrderNum);
-        List<SysDept> sysDeptList = list(lqw);
-        SysDeptTreeVo sysDeptTreeVo = BeanUtil.copyProperties(sysDept, SysDeptTreeVo.class);
-        List<SysDeptTreeVo> sysDeptTreeVos = BeanUtil.copyToList(sysDeptList, SysDeptTreeVo.class);
-        sysDeptTreeVos.add(sysDeptTreeVo);
-        Map<String, List<SysDeptTreeVo>> map = sysDeptTreeVos.stream().sorted(Comparator.comparing(SysDeptTreeVo::getId)).collect(Collectors.groupingBy(SysDeptTreeVo::getParentId));
-        sysDeptTreeVos.forEach(i -> {
-            i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>()));
-            i.setDeptCount(i.getChildren().size());
-        });
-        sysDeptTreeVos = map.get(sysDept.getParentId());
-
-
-        return sysDeptTreeVos;
-    }
 
 }
 

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

@@ -12,7 +12,6 @@ import com.ydtech.modules.admin.model.dto.SysPartnerDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerPageDto;
 import com.ydtech.modules.admin.model.vo.AgencyExtractFeeVo;
 import com.ydtech.modules.admin.model.vo.SysUserPartner;
-import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysPartnerService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;

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

@@ -14,6 +14,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.Comparator;
@@ -35,12 +36,13 @@ import java.util.stream.Collectors;
 @Service
 public class InsuranceHandlingSettlementMonthServiceImpl extends ServiceImpl<InsuranceHandlingSettlementMonthMapper, InsuranceHandlingSettlementMonthEntity> implements InsuranceHandlingSettlementMonthService {
     @Autowired
-    private InsPlyIncomeService  insPlyIncomeService;
+    private InsPlyIncomeService insPlyIncomeService;
+
     @Override
     public List<InsuranceHandlingSettlementMonthDto> queryList(InsuranceHandlingSettlementMonthVo insuranceHandlingSettlementMonthVo) {
-        List<InsuranceHandlingSettlementMonthDto>  incomeList=  insPlyIncomeService.getInvociAmount(insuranceHandlingSettlementMonthVo);
+        List<InsuranceHandlingSettlementMonthDto> incomeList = insPlyIncomeService.getInvociAmount(insuranceHandlingSettlementMonthVo);
         List<InsuranceHandlingSettlementMonthDto> resultList = baseMapper.queryList(insuranceHandlingSettlementMonthVo);
-        if(resultList.size()>0){
+        if (!resultList.isEmpty()) {
             Map<String, InsuranceHandlingSettlementMonthDto> latestByTaskId = resultList.stream()
                     .collect(Collectors.toMap(
                             InsuranceHandlingSettlementMonthDto::getIncomeSigningTime, // 用于生成Map的键
@@ -52,9 +54,15 @@ public class InsuranceHandlingSettlementMonthServiceImpl extends ServiceImpl<Ins
             for (InsuranceHandlingSettlementMonthDto   incomeItem   : incomeList){
                 String incomeSigningTime = incomeItem.getIncomeSigningTime();
                 InsuranceHandlingSettlementMonthDto insuranceHandlingSettlementMonthDto = latestByTaskId.get(incomeSigningTime);
-                incomeItem.setRemainingAmount(insuranceHandlingSettlementMonthDto.getRemainingAmount());
-                incomeItem.setTotalAmount(insuranceHandlingSettlementMonthDto.getTotalAmount());
+                if(ObjectUtils.isEmpty(insuranceHandlingSettlementMonthDto)){
+                    incomeItem.setRemainingAmount(incomeItem.getTotalAmount());
+                    incomeItem.setTotalAmount(incomeItem.getTotalAmount());
+                }else {
+                    incomeItem.setRemainingAmount(insuranceHandlingSettlementMonthDto.getRemainingAmount());
+                    incomeItem.setTotalAmount(insuranceHandlingSettlementMonthDto.getTotalAmount());
+                }
                 incomeItem.setCreateTime(null);
+
                 if( incomeItem.getSettlementAmount() ==null || incomeItem.getSettlementAmount().compareTo(BigDecimal.ZERO)==0){
                     incomeItem.setSettlementAmount(new BigDecimal("0.00"));
 

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

@@ -197,7 +197,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
                 throw new SystemException(responseMsg);
             }
         }
-        List<BoHaiQuoteAccidentVo> accidentalDrivingVo = quoteVo.getAccidentalDrivingVo();
+        List<BoHaiQuoteAccidentVo> accidentalDrivingVo = Optional.ofNullable(quoteVo.getAccidentalDrivingVo()).orElse(new ArrayList<>());
 //        InsAreaCompanyAccidentalDriving insAreaCompanyAccidentalDriving = new InsAreaCompanyAccidentalDriving();
 //        insAreaCompanyAccidentalDriving.setQuantity(quoteVo.getAccidentalDrivingVo());
         return getQuoteRespVo(response, quoteInfoVo, vehicleModelsDTO, ptlAgreementAttribution, orderNo, accidentalDrivingVo);

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -91,8 +91,8 @@
         (select approve_by from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as approveBy,
         (select approve_time from sys_user_track where user_id = su.id ORDER BY approve_time desc LIMIT 1) as
         approveTime,
-        (select id from sys_dept where id = su.pDeptId ) as levelFourDeptId,
-        (select name from sys_dept where id = su.pDeptId) as levelFourDeptName
+        (select id from sys_dept where id = psd.id ) as levelFourDeptId,
+        (select name from sys_dept where id = psd.id) as levelFourDeptName
         from sys_user su
         left join sys_dept sd on su.dept_id=sd.id
         left join sys_dept psd on sd.parent_id=psd.id