From bef2989d0751defdd39711ea966f06be23727dc7 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Mon, 25 May 2020 14:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E8=B4=AD=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/customer/CustomerService.java     | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 7f7c68d..dd5e3ca 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -228,6 +228,7 @@ public class CustomerService {
      * @date 2020/05/24 13:46
      */
     private void handleAddCustomer(TurnBackDTO turnBackDTOS) throws Exception {
+        log.error("没有jointime"+new Gson().toJson(turnBackDTOS));
         OpCustomer opCustomer = null;
         if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() != null) {
             //此时说明是企业微信扫码添加
@@ -285,7 +286,6 @@ public class CustomerService {
         if (StringUtils.isNotBlank(turnBackDTOS.getJoinTime())) {
             insertCustomer.setCreateTime(sdf.parse(turnBackDTOS.getJoinTime()));
         } else {
-            log.error("没有jointime"+new Gson().toJson(turnBackDTOS));
             return;
         }
         if (null != opCustomer) {
@@ -478,17 +478,6 @@ public class CustomerService {
                 insertRelation.setType(2);
             }
             opSellerCustomerRelationDOMapper.insert(insertRelation);
-        } else {
-            //可能是同步过来的数据，此时已经存在的话，用有导购的代替
-            opSellerCustomerRelation.setCreateTime(joinTime);
-            opSellerCustomerRelation.setUpdateTime(new Date());
-            opSellerCustomerRelation.setCustomerId(opCustomer.getId());
-            opSellerCustomerRelation.setStoreId(shopId);
-            opSellerCustomerRelation.setUserId(sellerId);
-            opSellerCustomerRelation.setCreateBy(Constants.SYS_OPERATION);
-            opSellerCustomerRelation.setUpdateBy(Constants.SYS_OPERATION);
-            opSellerCustomerRelation.setCpUserId(opCustomer.getCpUserId());
-            opSellerCustomerRelationDOMapper.updateById(opSellerCustomerRelation);
         }
     }