From 11d119de989ddeb72dfebe952f62feb867bd3f9d Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 7 Jul 2022 16:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=82=A8=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/AgencyServiceImpl.java |  2 +-
 .../java/com/epmet/entity/CustomerRelationEntity.java  |  5 +++++
 .../com/epmet/service/CustomerRelationService.java     | 10 ++++++++++
 .../service/impl/CustomerRelationServiceImpl.java      |  9 +++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 29d62f96e5..026bf12cf6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -916,7 +916,7 @@ public class AgencyServiceImpl implements AgencyService {
             customerDTO.setId(item.getCustomerId());
             Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
             if (customerResult.success() && null != customerResult.getData()) {
-                item.setCustomerName(customerResult.getData().getCustomerName());
+                item.setCustomerName(item.getOrganizationName().concat(StrConstant.HYPHEN).concat(customerResult.getData().getCustomerName()));
             }
         });
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
index 9c33664b50..1c0a077b14 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerRelationEntity.java
@@ -79,4 +79,9 @@ public class CustomerRelationEntity extends BaseEpmetEntity {
      */
 	private String areaCode;
 
+	/**
+	 * 当前客户的地区编码，实际就是根组织的area_code
+	 */
+	private String parentAreaCode;
+
 }
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
index 37700b0ee5..6dfaa6c86f 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerRelationService.java
@@ -75,6 +75,16 @@ public interface CustomerRelationService extends BaseService<CustomerRelationEnt
      */
     void save(CustomerRelationDTO dto);
 
+    /**
+     * 默认保存-数据融合版本
+     *
+     * @param dto
+     * @return void
+     * @author zhy
+     * @date 2022/7/7 14:56
+     */
+    void saveV2(CustomerRelationDTO dto);
+
     /**
      * 默认更新
      *
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
index 1d3974a4aa..d9ef04903d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java
@@ -105,6 +105,15 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveV2(CustomerRelationDTO dto) {
+        CustomerRelationEntity entity = ConvertUtils.sourceToTarget(dto, CustomerRelationEntity.class);
+        entity.setCustomerType("internal");
+        entity.setParentCustomerType("internal");
+        insert(entity);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(CustomerRelationDTO dto) {