Merge branch 'refs/heads/test' into test-20240815

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

@@ -158,7 +158,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
     @Override
     public List<SysUser> getUserInfo() {
-        List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getStatus, 1));
+        List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getStatus, 1).notLike(SysUser::getId,"M"));
         String id = BaseController.getUser().getId();
         List<SysUser> sysUserList = null;
         if (sysUsers.size() > 0) {

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

@@ -265,8 +265,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                         agencyExtractFee.setCashFee(multiply.subtract(new BigDecimal("0.00")));
                     }
 
-                    agencyExtractFeeList.add(agencyExtractFee);
                 }
+                agencyExtractFeeList.add(agencyExtractFee);
 
             }
         }

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/QuotationRequest.java

@@ -70,10 +70,11 @@ public class QuotationRequest extends BoHaiBaseRequest {
                 this.businessPolicy = new BusinessPolicyDTO(riskInfoVo, kindList, currentValue, carInfo, discount);
             }
         }
-        this.unAutos = accidentVo.stream().map(UnAutoDTO::new).collect(Collectors.toList());
+        if(ArrayUtil.isNotEmpty(accidentVo)){
+            this.unAutos = accidentVo.stream().map(UnAutoDTO::new).collect(Collectors.toList());
+        }
     }
 
-
     @NoArgsConstructor
     @Data
     public static class UnAutoDTO implements Serializable {

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

@@ -1323,16 +1323,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             dajiaBaseQuoteVo.setAccidentalDrivingVo(jsonObject);
             return dajiaBaseQuoteVo;
-        }
-
-        if (baseQuoteVo.getCompanyId().equals("BPIC1000000")) {
+        } else if (baseQuoteVo.getCompanyId().equals("BPIC1000000")) {
             // 渤海财险
             BaseQuoteVo<List<BoHaiQuoteAccidentVo>> bohaiBaseQuoteVo = new BaseQuoteVo<>();
             BeanUtils.copyProperties(baseQuoteVo, bohaiBaseQuoteVo);
             QuoteAccidentalDrivingVo accidentalDrivingVo = baseQuoteVo.getAccidentalDrivingVo();
             BoHaiQuoteAccidentVo boHaiQuoteAccidentVo = new BoHaiQuoteAccidentVo();
-            boHaiQuoteAccidentVo.setPackageCode(accidentalDrivingVo.getRiskCode());
-            boHaiQuoteAccidentVo.setProductCode(accidentalDrivingVo.getProjectCode());
+            boHaiQuoteAccidentVo.setPackageCode(accidentalDrivingVo.getProjectCode());
+            boHaiQuoteAccidentVo.setProductCode(accidentalDrivingVo.getRiskCode());
             boHaiQuoteAccidentVo.setCopies(String.valueOf(accidentalDrivingVo.getQuantity()));
             bohaiBaseQuoteVo.setAccidentalDrivingVo(Collections.singletonList(boHaiQuoteAccidentVo));
             return bohaiBaseQuoteVo;