保单详情保障内容附加险

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -266,7 +266,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         HolderInfo holderInfo = new HolderInfo();
         HolderInfo holderInfo = new HolderInfo();
         PolicyHolderN22 holder = policyDetail.getPolicyHolder();
         PolicyHolderN22 holder = policyDetail.getPolicyHolder();
         holderInfo.setName(holder.getFullName());
         holderInfo.setName(holder.getFullName());
-        holderInfo.setMobileNo(holder.getMobile());
+        holderInfo.setMobileNo(holder.getMobile().trim());
         holderInfo.setGender("1".equals(holder.getGender()) ? 1 : 2);
         holderInfo.setGender("1".equals(holder.getGender()) ? 1 : 2);
         holderInfo.setBirthDay(holder.getDateOfBirth());
         holderInfo.setBirthDay(holder.getDateOfBirth());
         holderInfo.setAge(CommonUtil.getAge(CommonUtil.stringParseDate(holder.getDateOfBirth(),"yyyy-MM-dd")));
         holderInfo.setAge(CommonUtil.getAge(CommonUtil.stringParseDate(holder.getDateOfBirth(),"yyyy-MM-dd")));
@@ -307,43 +307,49 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 //        referralInfo.setReferralAmount(CommonUtil.doubleFormat(commission,2));
 //        referralInfo.setReferralAmount(CommonUtil.doubleFormat(commission,2));
         responseVO.setReferralInfo(referralInfo);
         responseVO.setReferralInfo(referralInfo);
 
 
-        // 保障项目
-        PolicyFactorInfo policyFactorInfo = this.getPolicyFactorInfo(insureds);
+        // 保障项目和总保费
+        this.getPolicyFactorInfoAndPrice(insureds, responseVO);
 
 
-        List<PolicyFactorInfo> PolicyFactorInfoList= new ArrayList<>();
-        PolicyFactorInfoList.add(policyFactorInfo);
-        responseVO.setPolicyFactorInfos(PolicyFactorInfoList);
     }
     }
 
 
-    private PolicyFactorInfo getPolicyFactorInfo(List<InsuredDetailN22> insureds) {
+    private void getPolicyFactorInfoAndPrice(List<InsuredDetailN22> insureds, PolicyInfoQueryResponseVO responseVO) {
 
 
-        PolicyFactorInfo policyFactorInfo = null;
+        List<PolicyFactorInfo> policyFactorInfoList= new ArrayList<>();
 
 
-        CoverageN22 coverageN22;
+        BigDecimal price = BigDecimal.ZERO;
         ExtensionDataCoverage extensionData;
         ExtensionDataCoverage extensionData;
 
 
         if (CollectionUtils.isNotEmpty(insureds)) {
         if (CollectionUtils.isNotEmpty(insureds)) {
             List<CoverageN22> coverages = insureds.get(0).getCoverages();
             List<CoverageN22> coverages = insureds.get(0).getCoverages();
-            if (CollectionUtils.isNotEmpty(coverages)) {
-                coverageN22 = coverages.get(0);
-                extensionData = coverageN22.getExtensionData();
+            for (CoverageN22 coverage : coverages) {
+                if (CollectionUtils.isNotEmpty(coverages)) {
+
+                    extensionData = coverage.getExtensionData();
+                    CoverageFee coverageFee = coverage.getCoverageFee();
+
+                    // 赋值
+                    PolicyFactorInfo policyFactorInfo = new PolicyFactorInfo();
+                    policyFactorInfo.setPolicyType("寿险");
+                    policyFactorInfo.setProductName(coverage.getCoverageName());
+
+                    if (extensionData != null) {
+                        policyFactorInfo.setInsuredAmount(extensionData.getSumInsured());
+                        policyFactorInfo.setPayFrequency(extensionData.getInstallmentName());
+                        String period = extensionData.getInstallment().substring(1);
+                        policyFactorInfo.setPeriod(Integer.valueOf(period));
+                    }
 
 
-                // 赋值
-                policyFactorInfo = new PolicyFactorInfo();
-                policyFactorInfo.setPolicyType("寿险");
-                policyFactorInfo.setProductName(coverageN22.getCoverageName());
-
-                if (extensionData != null) {
-                    policyFactorInfo.setInsuredAmount(extensionData.getSumInsured());
-                    policyFactorInfo.setPayFrequency(extensionData.getInstallmentName());
-                    String period = extensionData.getInstallment().substring(1);
-                    policyFactorInfo.setPeriod(Integer.valueOf(period));
+                    if (coverageFee != null) {
+                        policyFactorInfo.setPremium(Double.valueOf(coverageFee.getApp()));
+                        price = price.add(new BigDecimal(coverageFee.getApp()));
+                    }
+                    policyFactorInfoList.add(policyFactorInfo);
                 }
                 }
-
             }
             }
         }
         }
 
 
-        return policyFactorInfo;
+        responseVO.setPolicyFactorInfos(policyFactorInfoList);
+        responseVO.setPrice(price.doubleValue());
     }
     }