/gov/mine/agency/getlatestcustomer返参增加haveSubCustomer、subCustomerIds

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/LatestCustomerResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -38,4 +39,14 @@ public class LatestCustomerResultDTO implements Serializable {
 	 * 性别0未知1男2女
 	 */
 	private Integer gender;
+
+	/**
+	 * 是否有字客户
+	 */
+	private Boolean haveSubCustomer;
+
+	/**
+	 * 子客户列表
+	 */
+	private List<String> subCustomerIds;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java

@@ -129,6 +129,9 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
     @Override
     public Result<LatestCustomerResultDTO> getLatestCustomer(String userId) {
         LatestCustomerResultDTO resultDTO = new LatestCustomerResultDTO();
+        resultDTO.setHaveSubCustomer(false);
+        resultDTO.setSubCustomerIds(new ArrayList<>());
+
         CustomerStaffAgencyDTO customerStaffAgencyDTO = baseDao.selectLatestCustomerByStaff(userId);
 
         resultDTO.setAgencyId(customerStaffAgencyDTO.getAgencyId());
@@ -150,6 +153,8 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
         if (customerResult.success() && null != customerResult.getData()) {
             resultDTO.setCustomerName(customerResult.getData().getCustomerName());
+            resultDTO.setHaveSubCustomer(customerResult.getData().getHaveSubCustomer());
+            resultDTO.setSubCustomerIds(customerResult.getData().getSubCustomerIds());
         }else{
             log.warn(String.format("根据客户id:%s,查询客户信息失败",customerDTO.getId()));
         }

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java

@@ -17,9 +17,11 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
+import java.util.List;
 
 
 /**
@@ -123,4 +125,13 @@ public class CustomerDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 06.21:扩展属性：是否有字客户
+     */
+    private Boolean haveSubCustomer;
+
+    /**
+     * 06.21:扩展属性：子客户列表
+     */
+    private List<String> subCustomerIds;
 }

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -215,7 +215,16 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Override
     public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
         CustomerEntity entity = baseDao.selectById(dto.getId());
-        return new Result<CustomerDTO>().ok(ConvertUtils.sourceToTarget(entity, CustomerDTO.class));
+        List<String> customerIds=customerRelationService.getAllSubCustomerIds(dto.getId());
+        CustomerDTO customerDTO=ConvertUtils.sourceToTarget(entity, CustomerDTO.class);
+        if(CollectionUtils.isEmpty(customerIds)){
+            customerDTO.setHaveSubCustomer(false);
+            customerDTO.setSubCustomerIds(new ArrayList<>());
+        }else{
+            customerDTO.setHaveSubCustomer(true);
+            customerDTO.setSubCustomerIds(customerIds);
+        }
+        return new Result<CustomerDTO>().ok(customerDTO);
     }
 
     @Override