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

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -685,8 +685,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         // 保單持有人
         if (apiPolicyholderInfoDto != null) {
             follow.setPolicyHolder(StringUtils.isNotBlank(apiPolicyholderInfoDto.getNameCn()) ? apiPolicyholderInfoDto.getNameCn() : apiPolicyholderInfoDto.getNamePyEn());
+            follow.setPolicyHolderEn(apiPolicyholderInfoDto.getNamePyEn());
         }
-
+        
         // 受保人信息
         if (!Objects.isNull(apiInsurantInfoDto)) {
             // 受保人

yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollow.java

@@ -265,6 +265,11 @@ public class PolicyFollow implements Serializable {
     private String policyHolder;
 
     /**
+     * 保單持有人（英文）
+     */
+    private String policyHolderEn;
+
+    /**
      * 受保人
      */
     private String insured;

yd-csf-service/src/main/java/com/yd/csf/service/service/PolicyFollowService.java

@@ -12,6 +12,7 @@ import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyNumberResponseVO;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -182,6 +183,8 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
      */
     Boolean updatePolicySecondHolder(PolicySecondHolderUpdateRequest policySecondHolderUpdateRequest);
 
+    Map<String, PolicyFollow> queryPolicyFollowMap(Collection<?> policyNoSet);
+
     Result<ApiPolicyFollowDetailResponse> detail(String policyNo);
 
     List<String> queryPolicyNoList(String policyHolder,String signer,String brokerName,String insured);

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

@@ -158,7 +158,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue));
 
         // 3.关联查询投保人名称
-        Map<String, PolicyPolicyholder> policyholderMap = policyPolicyholderService.queryPolicyholderMap(policyNoSet);
+        Map<String, PolicyFollow> policyFollowMap = policyFollowService.queryPolicyFollowMap(policyNoSet);
 
         // 4.关联查询转介人
         Map<String, PolicyBroker> policyBrokerMap = policyBrokerService.queryPolicyBrokerMap(policyNoSet);
@@ -184,11 +184,11 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
                 commissionVO.setCommissionRatio(commissionExpected.getCommissionRatio());
             }
-            PolicyPolicyholder policyholder = policyholderMap.get(commission.getPolicyNo());
-            if (policyholder != null) {
+            PolicyFollow policyFollow = policyFollowMap.get(commission.getPolicyNo());
+            if (policyFollow != null) {
                 // 填充投保人名称
-                commissionVO.setPolicyHolder(policyholder.getName());
-                commissionVO.setPolicyHolderEn(policyholder.getNameEn());
+                commissionVO.setPolicyHolder(policyFollow.getPolicyHolder());
+                commissionVO.setPolicyHolderEn(policyFollow.getPolicyHolderEn());
             }
             PolicyBroker policyBroker = policyBrokerMap.get(commission.getPolicyNo());
             if (policyBroker != null) {

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

@@ -65,7 +65,7 @@ public class PolicyBrokerServiceImpl extends ServiceImpl<PolicyBrokerMapper, Pol
             return Collections.emptyMap();
         }
         List<PolicyBroker> list = this.lambdaQuery().in(PolicyBroker::getPolicyNo, policyNoSet).list();
-        return list.stream().collect(Collectors.toMap(PolicyBroker::getPolicyNo, Function.identity()));
+        return list.stream().collect(Collectors.toMap(PolicyBroker::getPolicyNo, Function.identity(), (oldValue, newValue) -> newValue));
     }
 
     @Override

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

@@ -52,6 +52,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -1298,6 +1299,15 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         return policySecondHolderService.updatePolicySecondHolder(policySecondHolderUpdateRequest);
     }
 
+    @Override
+    public Map<String, PolicyFollow> queryPolicyFollowMap(Collection<?> policyNoSet) {
+        if (CollectionUtils.isEmpty(policyNoSet)) {
+            return Collections.emptyMap();
+        }
+        List<PolicyFollow> policyFollowList = this.list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoSet));
+        return policyFollowList.stream().collect(Collectors.toMap(PolicyFollow::getPolicyNo, Function.identity(), (oldValue, newValue) -> newValue));
+    }
+
     /**
      * 根据保单号查询新单跟进详情
      * @param policyNo

yd-csf-service/src/main/resources/mappers/PolicyFollowMapper.xml

@@ -53,6 +53,7 @@
         <result property="status" column="status" />
         <result property="nextStatusList" column="next_status_list" />
         <result property="policyHolder" column="policy_holder" />
+        <result property="policyHolderEn" column="policy_holder_en" />
         <result property="insured" column="insured" />
         <result property="insuredBizId" column="insured_biz_id" />
         <result property="insuredAge" column="insured_age" />
@@ -95,7 +96,7 @@
         each_issue_premium,is_prepay,is_traceable,retroactive_date,prepaid_term,
         prepaid_amount,prepaid_amount_after_discount,policy_expiration_date,payment_number,product_launch_biz_id,
         product_name,product_cate,category_code,insurance_company,insurance_company_biz_id,reconciliation_company,insurance_category_biz_id,
-        reconciliation_company_biz_id,status,next_status_list,policy_holder,insured,insured_biz_id,
+        reconciliation_company_biz_id,status,next_status_list,policy_holder,policy_holder_en,insured,insured_biz_id,
         insured_age,grace_period,is_join,policy_currency,initial_payment_method,
         initial_premium,initial_premium_total,initial_payment_status,initial_premium_discount,
         mailing_method,renewal_payment_method,dividend_distribution_method,delivery_no,