From 99e8f26bb2090e459907e0d0f5615112c92bb7bf Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Wed, 13 May 2020 01:49:17 +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 --- src/main/java/com/kiisoo/ic/customer/CustomerService.java | 4 +++- src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 39d006a..a1f47fd 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -194,7 +194,9 @@ public class CustomerService { insertCustomer.setName(turnBackDTOS.getName()); insertCustomer.setAvatarUrl(turnBackDTOS.getWxData().getAvatarUrl()); insertCustomer.setPhone(turnBackDTOS.getPhone()); - insertCustomer.setShopName(shop.getName()); + if (shop != null && StringUtils.isNotBlank(shop.getName())){ + insertCustomer.setShopName(shop.getName()); + } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); insertCustomer.setCreateTime(sdf.parse(turnBackDTOS.getJoinTime())); if (null != opCustomer) { diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index a0042de..160ebfe 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -35,7 +35,7 @@ limit 1