前端对接问题修复32

09304caf · jianan · cf2285ca · 09304caf · 09304caf · 09304caf
Commit 09304caf authored Jan 04, 2026 by jianan
3 changed files
--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionExpectedServiceImpl.java
@@ -11,10 +11,7 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.component.ReceivableService;
-import com.yd.csf.service.dto.CommissionExpectedAddDto;
+import com.yd.csf.service.dto.*;
-import com.yd.csf.service.dto.CommissionExpectedAddRequest;
-import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
-import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionExpected;
@@ -31,6 +28,7 @@ import com.yd.user.feign.client.sysdict.ApiSysDictFeignClient;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import com.yd.user.service.model.SysDictItem;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -78,18 +76,22 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        // 关联查询保单信息
        Set<String> policyNoSet = CommissionExpectedList.stream().map(CommissionExpected::getPolicyNo).collect(Collectors.toSet());
-        QueryWrapper<PolicyFollow> queryWrapper = new QueryWrapper<PolicyFollow>();
+        QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
-        queryWrapper.select("policy_no", "payment_premium");
+        queryWrapper.select("policy_no", "payment_premium", "product_name", "insurance_company", "reconciliation_company");
        queryWrapper.in("policy_no", policyNoSet);
-        Map<String, PolicyFollow> policyMap = policyFollowService.list(queryWrapper)
+        List<Policy> policyList = policyService.list(queryWrapper);
-                .stream().collect(Collectors.toMap(PolicyFollow::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
+        Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
        // 填充信息
        List<CommissionExpectedVO> CommissionExpectedVOList = CommissionExpectedList.stream().map(commissionExpected -> {
            CommissionExpectedVO commissionExpectedVO = CommissionExpectedVO.objToVo(commissionExpected);
-            PolicyFollow policyFollow = policyMap.get(commissionExpected.getPolicyNo());
+            Policy policy = policyMap.get(commissionExpected.getPolicyNo());
-            if (policyFollow != null) {
+            if (policy != null) {
-                commissionExpectedVO.setPremium(policyFollow.getPaymentPremium());
+                // 填充保费、产品名称、保险公司、对账公司
+                commissionExpectedVO.setPremium(policy.getPaymentPremium());
+                commissionExpectedVO.setProductName(policy.getProductName());
+                commissionExpectedVO.setInsuranceCompany(policy.getInsuranceCompany());
+                commissionExpectedVO.setReconciliationCompany(policy.getReconciliationCompany());
            }
            return commissionExpectedVO;
        }).collect(Collectors.toList());
@@ -234,14 +236,24 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
        if (CollUtil.isEmpty(addDtoList)) {
            throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计入账列表不能为空");
        }
-        // 查询保单信息
+        // 查询保单信息、保单产品信息
        Set<String> policyNoSet = addDtoList.stream()
                .map(CommissionExpectedAddDto::getPolicyNo)
                .collect(Collectors.toSet());
+        Map<String, Policy> policyMap = new HashMap<>();
+        Map<String, PolicyProductInfo> policyProductInfoMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(policyNoSet)) {
            List<Policy> policyList = policyService.lambdaQuery().in(Policy::getPolicyNo, policyNoSet).list();
            // 保单映射
-        Map<String, Policy> policyMap = policyList.stream()
+            policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, Function.identity()));
-                .collect(Collectors.toMap(Policy::getPolicyNo, Function.identity()));
+            // 关联查询保单产品信息
+            Set<String> productLaunchBizIdSet = policyList.stream()
+                    .map(Policy::getProductLaunchBizId)
+                    .collect(Collectors.toSet());
+//            policyProductInfoMap = policyService.getPolicyProductInfoMap(productLaunchBizIdSet);
+        }
        List<CommissionExpected> addList = new ArrayList<>();
        List<CommissionExpected> updateList = new ArrayList<>();

--- a/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
@@ -21,6 +21,7 @@ import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.CommissionMapper;
+import com.yd.csf.service.vo.CommissionExpectedVO;
 import com.yd.csf.service.vo.CommissionStatisticsVO;
 import com.yd.csf.service.vo.CommissionVO;
 import lombok.extern.slf4j.Slf4j;
@@ -121,7 +122,27 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
            return commissionVOPage;
        }
-        List<CommissionVO> commissionVOList = commissionList.stream().map(CommissionVO::objToVo).collect(Collectors.toList());
+        // 关联查询保单信息
+        Set<String> policyNoSet = commissionList.stream().map(Commission::getPolicyNo).collect(Collectors.toSet());
+        QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
+        queryWrapper.select("policy_no", "payment_premium", "product_name", "insurance_company", "reconciliation_company");
+        queryWrapper.in("policy_no", policyNoSet);
+        List<Policy> policyList = policyService.list(queryWrapper);
+        Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
+        // 填充信息
+        List<CommissionVO> commissionVOList = commissionList.stream().map(commission -> {
+            CommissionVO commissionVO = CommissionVO.objToVo(commission);
+            Policy policy = policyMap.get(commission.getPolicyNo());
+            if (policy != null) {
+                // 填充保费、产品名称、保险公司、对账公司
+                commissionVO.setPremium(policy.getPaymentPremium());
+                commissionVO.setProductName(policy.getProductName());
+                commissionVO.setInsuranceCompany(policy.getInsuranceCompany());
+                commissionVO.setReconciliationCompany(policy.getReconciliationCompany());
+            }
+            return commissionVO;
+        }).collect(Collectors.toList());
        commissionVOPage.setRecords(commissionVOList);
        return commissionVOPage;

--- a/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java
+++ b/yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedVO.java
@@ -47,22 +47,34 @@ public class CommissionExpectedVO implements Serializable {
    private String policyNo;
    /**
+     * 期交保费
+     */
+    @Schema(description = "期交保费")
+    private Object premium;
+    /**
+     * 产品计划名称
+     */
+    @Schema(description = "产品计划名称")
+    private String productName;
+    /**
     * 保险公司业务ID
     */
    @Schema(description = "保险公司业务ID")
-    private String insurerBizId;
+    private String insuranceCompanyBizId;
    /**
-     * 产品上架信息表唯一业务ID
+     * 保险公司
     */
-    @Schema(description = "产品计划: 产品上架信息表唯一业务ID")
+    @Schema(description = "保险公司")
-    private String productLaunchBizId;
+    private String insuranceCompany;
    /**
-     * 保费
+     * 产品上架信息表唯一业务ID
     */
-    @Schema(description = "保费")
+    @Schema(description = "产品计划: 产品上架信息表唯一业务ID")
-    private Object premium;
+    private String productLaunchBizId;
    /**
     * 对账公司
@@ -103,7 +115,7 @@ public class CommissionExpectedVO implements Serializable {
    /**
     * 预计入账金额
     */
-    @Schema(description = "预计入账金额 HKD（如果不关联保单，就没有预计入账比例了，此时记录预计入账金额）")
+    @Schema(description = "预计入账金额 HKD（如果不关联保单，就没有预计入账比例，此时记录预计入账金额）")
    private BigDecimal amount;
    /**