Fna接口29

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

@@ -60,14 +60,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         // 1. 关联查询扩展信息
         CustomerExpand customerExpand = customerExpandService.getByCustomerBizId(customer.getCustomerBizId());
         if (customerExpand != null) {
-            CustomerExpandVO customerExpandVO = CustomerExpandVO.objToVo(customerExpand);
+            BeanUtils.copyProperties(customerExpand, customerVO);
 
             if (StringUtils.isNotBlank(customerExpand.getAddressList())) {
                 List<AddressVO> addressList = GSON.fromJson(customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
                 }.getType());
-                customerExpandVO.setAddressList(addressList);
+                customerVO.setAddressList(addressList);
             }
-            customerVO.setCustomerExpand(customerExpandVO);
         }
         return customerVO;
     }
@@ -112,13 +111,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
                 customerExpand = customerBizIdCustomerExpandListMap.get(customerBizId).get(0);
             }
             if (customerExpand != null) {
-                CustomerExpandVO customerExpandVO = CustomerExpandVO.objToVo(customerExpand);
+                BeanUtils.copyProperties(customerExpand, customerVO);
+
                 if ( StringUtils.isNotBlank(customerExpand.getAddressList())) {
                     List<AddressVO> addressList = GSON.fromJson(customerExpand.getAddressList(), new TypeToken<List<AddressVO>>() {
                     }.getType());
-                    customerExpandVO.setAddressList(addressList);
+                    customerVO.setAddressList(addressList);
                 }
-                customerVO.setCustomerExpand(customerExpandVO);
             }
         });
         // endregion

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

@@ -6,7 +6,9 @@ import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * customer视图
@@ -208,9 +210,70 @@ public class CustomerVO implements Serializable {
     private Date createTime;
 
     /**
-     * 客户扩展信息
+     * 客户类型
      */
-    private CustomerExpandVO customerExpand;
+    @Schema(description = "客户类型 字典值: csf_customer_type")
+    private String customerType;
+
+    /**
+     * 居住地区代码
+     */
+    @Schema(description = "居住地区代码")
+    private String residenceAreaCode;
+
+    /**
+     * 住宅电话
+     */
+    @Schema(description = "住宅电话")
+    private String residenceTelephone;
+
+    /**
+     * 是否长期出国
+     */
+    @Schema(description = "是否长期出国 字典值: sys_no_yes")
+    private String longtimeAbroad;
+
+    /**
+     * 地址
+     */
+    @Schema(description = "地址列表")
+    private List<AddressVO> addressList;
+
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String companyName;
+
+    /**
+     * 公司地区代码
+     */
+    @Schema(description = "公司地区代码")
+    private String companyAreaCode;
+
+    /**
+     * 公司电话
+     */
+    @Schema(description = "公司电话")
+    private String companyTelephone;
+
+    /**
+     * 职位
+     */
+    @Schema(description = "职位")
+    private String position;
+
+    /**
+     * 工作年限
+     */
+    @Schema(description = "工作年限")
+    private String workYear;
+
+    /**
+     * 薪资
+     */
+    @Schema(description = "薪资")
+    private BigDecimal salary;
 
     /**
      * 封装类转对象