diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index c2e2819..80cbb51 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -222,7 +222,9 @@ public class CustomerService { insertCustomer.setShopName(shop.getName()); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - insertCustomer.setCreateTime(sdf.parse(turnBackDTOS.getJoinTime())); + if (turnBackDTOS.getJoinTime() != null){ + insertCustomer.setCreateTime(sdf.parse(turnBackDTOS.getJoinTime())); + } if (null != opCustomer) { //更新一下 insertCustomer.setId(opCustomer.getId()); 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 03f7d5d..4bc59bf 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -2,6 +2,7 @@ package com.kiisoo.ic.employee.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.gson.Gson; import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpResult; @@ -552,8 +553,11 @@ public class EmployeeService { wxDataDTO.setUserId(externalContact.getExternalUserId()); wxDataDTO.setUnionId(externalContact.getUnionId()); turnBackDTO.setWxData(wxDataDTO); - - customerService.turnBack(turnBackDTO); + try { + customerService.turnBack(turnBackDTO); + }catch (Exception e) { + log.error(new Gson().toJson(turnBackDTO),e); + } } } } diff --git a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java index 4f06de3..5e9be15 100644 --- a/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java +++ b/src/main/java/com/kiisoo/ic/job/DTOMessageHandler.java @@ -45,7 +45,7 @@ public class DTOMessageHandler implements EventHandler { }catch (Exception e) { log.error("查询联系人失败:"+cpUserId,e); } - if (CollectionUtils.isNotEmpty(customers)){ + if (CollectionUtils.isEmpty(customers)){ return; } for (WxCpUserExternalContactInfo customer:customers){