新单跟进28

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyBeneficiaryAddRequest.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Data
 public class PolicyBeneficiaryAddRequest implements Serializable {
@@ -180,7 +182,7 @@ public class PolicyBeneficiaryAddRequest implements Serializable {
      * 地址列表（json串）
      */
     @Schema(description = "地址列表（json串）")
-    private String addressList;
+    private List<Map<String, Object>> addressList;
 
     /**
      * 通用备注

yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowAggregateDto.java

@@ -104,6 +104,9 @@ public class PolicyFollowAggregateDto implements Serializable {
         }
         // 设置保单受益人
         if (CollectionUtils.isNotEmpty(beneficiaryList)) {
+            beneficiaryList.forEach(beneficiary -> {
+                beneficiary.setAddressList(GSONUtil.fromJson((String) beneficiary.getAddressList(), new TypeToken<List<Map<String, Object>>>() {}.getType()));
+            });
             dto.setApiBeneficiaryInfoDtoList(beneficiaryList);
         }
         // 设置保单第二持有人

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

@@ -165,7 +165,7 @@ public class PolicyBeneficiary implements Serializable {
     /**
      * 地址列表（json串）
      */
-    private String addressList;
+    private Object addressList;
 
     /**
      * 通用备注

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

@@ -12,6 +12,8 @@ import com.yd.csf.service.model.PolicyAdditional;
 import com.yd.csf.service.model.PolicyBeneficiary;
 import com.yd.csf.service.service.PolicyBeneficiaryService;
 import com.yd.csf.service.dao.PolicyBeneficiaryMapper;
+import com.yd.csf.service.utils.GSONUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -92,6 +94,9 @@ public class PolicyBeneficiaryServiceImpl extends ServiceImpl<PolicyBeneficiaryM
                 BeanUtils.copyProperties(beneficiaryAddRequest, beneficiary);
                 beneficiary.setPolicyBeneficiaryBizId(RandomStringGenerator.generateBizId16("policy_beneficiary"));
                 beneficiary.setPolicyBizId(policyBeneficiaryUpdateRequest.getPolicyBizId());
+                if (CollectionUtils.isNotEmpty(beneficiaryAddRequest.getAddressList())) {
+                    beneficiary.setAddressList(GSONUtil.toJson(beneficiaryAddRequest.getAddressList()));
+                }
                 beneficiary.setCreateTime(new Date());
                 beneficiary.setUpdateTime(new Date());
                 return beneficiary;