From ec5b50873839b1e95a248315bd171186d547c37b Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Thu, 9 Apr 2020 15:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kiisoo/ic/customer/CustomerService.java   | 15 +++++++++++++++
 .../com/kiisoo/ic/customer/entity/OpCustomer.java |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index 10c9105..5abc36a 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -59,6 +60,16 @@ public class CustomerService {
         this.poiStoreStaffDOMapper = poiStoreStaffDOMapper;
     }
 
+    @PostConstruct
+    public void test(){
+        CustomerDTO customerDTO = new CustomerDTO();
+        customerDTO.setUniId("insduneubg-1234");
+        customerDTO.setName("何永东");
+        customerDTO.setStaffCode("001");
+        customerDTO.setShopCode("002");
+        customerRelation(customerDTO);
+    }
+
     /**
      * 绑定客户的关系
      * @param customerDTO 传输实体
@@ -74,10 +85,14 @@ public class CustomerService {
         QueryWrapper<PoiStore> poiWrapper = new QueryWrapper<>();
         poiWrapper.eq("code",customerDTO.getShopCode()).last("limit 1");
         PoiStore poiStore = poiStoreDOMapper.selectOne(poiWrapper);
+
         //导购信息
         QueryWrapper<PoiStoreStaff> wrapper = new QueryWrapper<>();
         wrapper.eq("staff_code",customerDTO.getStaffCode()).eq("store_code",customerDTO.getShopCode()).last("limit 1");
         PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectOne(wrapper);
+        if(poiStoreStaff == null || poiStore == null){
+            return null;
+        }
 
         //做插入使用
         OpCustomer insertCustomer = new OpCustomer();
diff --git a/src/main/java/com/kiisoo/ic/customer/entity/OpCustomer.java b/src/main/java/com/kiisoo/ic/customer/entity/OpCustomer.java
index 16320fa..81fbbc4 100644
--- a/src/main/java/com/kiisoo/ic/customer/entity/OpCustomer.java
+++ b/src/main/java/com/kiisoo/ic/customer/entity/OpCustomer.java
@@ -1,6 +1,7 @@
 package com.kiisoo.ic.customer.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -64,6 +65,7 @@ public class OpCustomer {
 	/**
 	 * 客户描述
 	 */
+    @TableField("`desc`")
 	private String desc;
 
 	/**