Merge remote-tracking branch 'origin/dev' into prod

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -96,6 +96,12 @@ public class ApiExpectedFortunePageResponse {
     private String brokerBizId;
 
     /**
+     * 转介人等级名称
+     */
+    @Schema(description = "转介人等级名称")
+    private String brokerGradeName;
+
+    /**
      * 团队名称
      */
     @Schema(description = "团队名称")

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java

@@ -879,7 +879,8 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
 
     private boolean isEffective(LocalDateTime effectiveStart, LocalDateTime effectiveEnd, Date effectiveDate) {
         LocalDateTime effectiveDateLocal = effectiveDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-        return effectiveDateLocal.isAfter(effectiveStart) && effectiveDateLocal.isBefore(effectiveEnd);
+        return effectiveDateLocal.compareTo(effectiveStart) >= 0
+                && effectiveDateLocal.compareTo(effectiveEnd) <= 0;
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ExpectedFortuneServiceImpl.java

@@ -6,20 +6,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.expectedfortune.ApiExpectedFortunePageRequest;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
+import com.yd.csf.service.dto.UserGradeDto;
 import com.yd.csf.service.enums.CurrencyEnum;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.dao.ExpectedFortuneMapper;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.PolicyFollow;
-import com.yd.csf.service.service.IConditionConfigService;
-import com.yd.csf.service.service.IExpectedFortuneService;
+import com.yd.csf.service.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yd.csf.service.service.PolicyFollowService;
-import com.yd.csf.service.service.PolicyService;
 import com.yd.csf.service.vo.ExpectedFortuneStatisticsVO;
 import com.yd.csf.service.vo.PayableReportVO;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -46,6 +46,9 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
     @Resource
     private IConditionConfigService iConditionConfigService;
 
+    @Autowired
+    private IAgentAccumulatedFycService iAgentAccumulatedFycService;
+
     @Override
     public IPage<ApiExpectedFortunePageResponse> page(Page<ApiExpectedFortunePageResponse> page,
                                                       ApiExpectedFortunePageRequest request) {
@@ -104,6 +107,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
                 .collect(Collectors.toList());
 
         Map<String, String> brokerRatioMap = new HashMap<>();
+        List<UserGradeDto> userGradeDtoList = new ArrayList<>();
         if (CollUtil.isNotEmpty(brokerBizIds)) {
             List<Map<String, Object>> ratioList = iConditionConfigService.selectBrokerRatioByBizIds(brokerBizIds);
             brokerRatioMap = ratioList.stream()
@@ -113,7 +117,10 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
                             map -> (String) map.get("conditional_value"),
                             (v1, v2) -> v1
                     ));
+            userGradeDtoList = iAgentAccumulatedFycService.queryUserGradeList(brokerBizIds);
         }
+        Map<String, UserGradeDto> userGradeMap = userGradeDtoList.stream()
+                .collect(Collectors.toMap(UserGradeDto::getClientUserBizId, Function.identity()));
 
         List<String> policyNos = expectedFortuneList.stream()
                 .map(ExpectedFortune::getPolicyNo)
@@ -141,6 +148,10 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
 
             Policy policy = policyMap.get(ef.getPolicyNo());
             PolicyFollow follow = policyFollowMap.get(ef.getPolicyNo());
+            UserGradeDto userGradeDto = userGradeMap.get(ef.getBrokerBizId());
+            if (userGradeDto != null) {
+                vo.setBrokerGradeName(userGradeDto.getGradeName());
+            }
             if (policy != null) {
                 vo.setInsuranceCompany(policy.getInsuranceCompany());
                 vo.setPremium(policy.getPaymentPremium());

yd-csf-service/src/main/java/com/yd/csf/service/vo/ExpectedFortuneExportDTO.java

@@ -39,6 +39,9 @@ public class ExpectedFortuneExportDTO {
     @ExcelProperty("转介人名称")
     private String broker;
 
+    @ExcelProperty("转介人等级")
+    private String brokerGradeName;
+
     @ExcelProperty("团队名称")
     private String team;
 
@@ -138,6 +141,7 @@ public class ExpectedFortuneExportDTO {
         dto.setPaidRatio(vo.getPaidRatio());
         dto.setUnpaidRatio(vo.getUnpaidRatio());
         dto.setRemark(vo.getRemark());
+        dto.setBrokerGradeName(vo.getBrokerGradeName());
         return dto;
     }