Fna接口6

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

@@ -211,25 +211,21 @@ public class CustomerAddRequest implements Serializable {
     /**
     /**
      * 居住地址
      * 居住地址
      */
      */
-    @Schema(description = "居住地址")
     private AddressVO residenceAddress;
     private AddressVO residenceAddress;
 
 
     /**
     /**
      * 住宅地址
      * 住宅地址
      */
      */
-    @Schema(description = "住宅地址")
     private AddressVO residentialAddress;
     private AddressVO residentialAddress;
 
 
     /**
     /**
      * 邮寄地址
      * 邮寄地址
      */
      */
-    @Schema(description = "邮寄地址")
     private AddressVO mailingAddress;
     private AddressVO mailingAddress;
 
 
     /**
     /**
      * 公司地址
      * 公司地址
      */
      */
-    @Schema(description = "公司地址")
     private AddressVO companyAddress;
     private AddressVO companyAddress;
 
 
     /**
     /**

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
+
+import com.yd.csf.service.vo.AddressVO;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
@@ -55,22 +57,22 @@ public class CustomerExpand implements Serializable {
     /**
     /**
      * 居住地址
      * 居住地址
      */
      */
-    private Object residenceAddress;
+    private AddressVO residenceAddress;
 
 
     /**
     /**
      * 住宅地址
      * 住宅地址
      */
      */
-    private Object residentialAddress;
+    private AddressVO residentialAddress;
 
 
     /**
     /**
      * 邮寄地址
      * 邮寄地址
      */
      */
-    private Object mailingAddress;
+    private AddressVO mailingAddress;
 
 
     /**
     /**
      * 公司地址
      * 公司地址
      */
      */
-    private Object companyAddress;
+    private AddressVO companyAddress;
 
 
     /**
     /**
      * 公司名称
      * 公司名称

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

@@ -57,19 +57,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         BeanUtils.copyProperties(customerAddRequest, customerExpand);
         BeanUtils.copyProperties(customerAddRequest, customerExpand);
         AddressVO residenceAddress = customerAddRequest.getResidenceAddress();
         AddressVO residenceAddress = customerAddRequest.getResidenceAddress();
         if (residenceAddress != null) {
         if (residenceAddress != null) {
-            customerExpand.setResidenceAddress(GSON.toJson(residenceAddress));
+            customerExpand.setResidenceAddress(residenceAddress);
         }
         }
         AddressVO residentialAddress = customerAddRequest.getResidentialAddress();
         AddressVO residentialAddress = customerAddRequest.getResidentialAddress();
         if (residentialAddress != null) {
         if (residentialAddress != null) {
-            customerExpand.setResidentialAddress(GSON.toJson(residentialAddress));
+            customerExpand.setResidentialAddress(residentialAddress);
         }
         }
         AddressVO mailingAddress = customerAddRequest.getMailingAddress();
         AddressVO mailingAddress = customerAddRequest.getMailingAddress();
         if (mailingAddress != null) {
         if (mailingAddress != null) {
-            customerExpand.setMailingAddress(GSON.toJson(mailingAddress));
+            customerExpand.setMailingAddress(mailingAddress);
         }
         }
         AddressVO companyAddress = customerAddRequest.getCompanyAddress();
         AddressVO companyAddress = customerAddRequest.getCompanyAddress();
         if (companyAddress != null) {
         if (companyAddress != null) {
-            customerExpand.setCompanyAddress(GSON.toJson(companyAddress));
+            customerExpand.setCompanyAddress(companyAddress);
         }
         }
         return customerExpand;
         return customerExpand;
     }
     }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 @Data
 @Data
+@Schema(description = "地址 residenceAddress-居住地址、residentialAddress-住宅地址、mailingAddress-邮寄地址、companyAddress-公司地址")
 public class AddressVO implements Serializable {
 public class AddressVO implements Serializable {
 
 
     @Schema(description = "区域")
     @Schema(description = "区域")

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

 package com.yd.csf.service.vo;
 package com.yd.csf.service.vo;
 
 
 import com.yd.csf.service.model.CustomerExpand;
 import com.yd.csf.service.model.CustomerExpand;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 
 
@@ -12,86 +13,99 @@ import java.math.BigDecimal;
  *
  *
  */
  */
 @Data
 @Data
+@Schema(description = "客户扩展信息")
 public class CustomerExpandVO implements Serializable {
 public class CustomerExpandVO implements Serializable {
 
 
     /**
     /**
      * 客户扩展信息唯一业务ID
      * 客户扩展信息唯一业务ID
      */
      */
+    @Schema(description = "客户扩展信息唯一业务ID")
     private String customerExpandBizId;
     private String customerExpandBizId;
 
 
     /**
     /**
      * 客户信息唯一标识(业务ID)
      * 客户信息唯一标识(业务ID)
      */
      */
+    @Schema(description = "客户信息唯一标识(业务ID)")
     private String customerBizId;
     private String customerBizId;
 
 
     /**
     /**
      * 客户类型
      * 客户类型
      */
      */
+    @Schema(description = "客户类型")
     private Object customerType;
     private Object customerType;
 
 
     /**
     /**
      * 居住地区代码
      * 居住地区代码
      */
      */
+    @Schema(description = "居住地区代码")
     private String residenceAreaCode;
     private String residenceAreaCode;
 
 
     /**
     /**
      * 住宅电话
      * 住宅电话
      */
      */
+    @Schema(description = "住宅电话")
     private String residenceTelephone;
     private String residenceTelephone;
 
 
     /**
     /**
      * 是否长期出国
      * 是否长期出国
      */
      */
+    @Schema(description = "是否长期出国")
     private String longtimeAbroad;
     private String longtimeAbroad;
 
 
     /**
     /**
      * 居住地址
      * 居住地址
      */
      */
-    private Object residenceAddress;
+    private AddressVO residenceAddress;
 
 
     /**
     /**
      * 住宅地址
      * 住宅地址
      */
      */
-    private Object residentialAddress;
+    private AddressVO residentialAddress;
 
 
     /**
     /**
      * 邮寄地址
      * 邮寄地址
      */
      */
-    private Object mailingAddress;
+    private AddressVO mailingAddress;
 
 
     /**
     /**
      * 公司地址
      * 公司地址
      */
      */
-    private Object companyAddress;
+    private AddressVO companyAddress;
 
 
     /**
     /**
      * 公司名称
      * 公司名称
      */
      */
+    @Schema(description = "公司名称")
     private String companyName;
     private String companyName;
 
 
     /**
     /**
      * 公司地区代码
      * 公司地区代码
      */
      */
+    @Schema(description = "公司地区代码")
     private String companyAreaCode;
     private String companyAreaCode;
 
 
     /**
     /**
      * 公司电话
      * 公司电话
      */
      */
+    @Schema(description = "公司电话")
     private String companyTelephone;
     private String companyTelephone;
 
 
     /**
     /**
      * 职位
      * 职位
      */
      */
+    @Schema(description = "职位")
     private String position;
     private String position;
 
 
     /**
     /**
      * 工作年限
      * 工作年限
      */
      */
+    @Schema(description = "工作年限")
     private String workYear;
     private String workYear;
 
 
     /**
     /**
      * 薪资
      * 薪资
      */
      */
+    @Schema(description = "薪资")
     private BigDecimal salary;
     private BigDecimal salary;
 
 
     /**
     /**

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

@@ -204,7 +204,6 @@ public class CustomerVO implements Serializable {
     /**
     /**
      * 客户扩展信息
      * 客户扩展信息
      */
      */
-    @Schema(description = "客户扩展信息")
     private CustomerExpandVO customerExpand;
     private CustomerExpandVO customerExpand;
 
 
     /**
     /**