From 26ae919defba23b61bed774a31f4ae00131fc1cb Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Wed, 13 May 2020 12:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/customer/CustomerService.java   | 29 ++++++++++++++++---
 .../controller/EmployeeController.java        | 16 ++++++++++
 .../ic/employee/service/EmployeeService.java  |  1 +
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index a1f47fd..6dbf343 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -210,9 +210,20 @@ public class CustomerService {
             }
             if (poiStoreStaff != null) {
                 //存在--1.处理客户导购关系。
-                sellerCustomerRelation(opCustomer, turnBackDTOS.getEaCode(),sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId(), poiStoreStaff.getId());
+
+                try {
+                    sellerCustomerRelation(opCustomer, turnBackDTOS.getEaCode(),sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId(), poiStoreStaff.getId());
+                }catch (Exception e) {
+                    System.out.println(opCustomer.toString());
+                    return;
+                }
             } else {
-                storeCustomerRelation(opCustomer,sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId());
+                try {
+                    storeCustomerRelation(opCustomer,sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId());
+                }catch (Exception e) {
+                    System.out.println(opCustomer.toString());
+                    return;
+                }
             }
         } else {
             insertCustomer.setCreateBy(Constants.SYS_OPERATION);
@@ -226,9 +237,19 @@ public class CustomerService {
 
             if (poiStoreStaff != null) {
                 //添加关系
-                sellerCustomerRelation(insertCustomer, turnBackDTOS.getEaCode(),sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId(), poiStoreStaff.getId());
+                try {
+                    sellerCustomerRelation(insertCustomer, turnBackDTOS.getEaCode(),sdf.parse(turnBackDTOS.getJoinTime()), poiStore.getStoreId(), poiStoreStaff.getId());
+                }catch (Exception e) {
+                    System.out.println(insertCustomer.toString());
+                    return;
+                }
             } else {
-                storeCustomerRelation(insertCustomer, sdf.parse(turnBackDTOS.getJoinTime()),poiStore.getStoreId());
+                try {
+                    storeCustomerRelation(insertCustomer, sdf.parse(turnBackDTOS.getJoinTime()),poiStore.getStoreId());
+                }catch (Exception e) {
+                    System.out.println(insertCustomer.toString());
+                    return;
+                }
             }
         }
 
diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
index 526913c..3830283 100644
--- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
+++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java
@@ -84,6 +84,22 @@ public class EmployeeController extends BaseController {
             return fail();
         }
     }
+    /**
+     * 同步客户数据
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "modify/custommer/relation",method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String,Object> modifyTagRelation(){
+        try {
+            employeeService.modifyTagRelation();
+            return success();
+        }catch (Exception e){
+            log.error("同步客户数据失败",e);
+            return fail();
+        }
+    }
     /**
      * 清理客户数据
      * @return
diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
index 79c721a..d22adde 100644
--- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
+++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java
@@ -631,6 +631,7 @@ public class EmployeeService {
                     customerService.turnBack(turnBackDTO);
                 }
             }
+            System.out.println("完成："+cpUserId);
         }
 
     }