diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index a0923dd..f0514c7 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -168,7 +168,7 @@ public class CustomerService { */ public void turnBack(TurnBackDTO turnBackDTOS) throws Exception { OpCustomer opCustomer = null; - if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() == null) { + if (turnBackDTOS.getWxData().getUnionId() == null && turnBackDTOS.getWxData().getUserId() != null) { //此时说明是企业微信扫码添加 QueryWrapper customerWrapper = new QueryWrapper<>(); customerWrapper.eq("wechat_uni_id", null).eq("external_userid", turnBackDTOS.getWxData().getUserId()).last("limit 1"); @@ -206,6 +206,7 @@ public class CustomerService { OpCustomer insertCustomer = new OpCustomer(); insertCustomer.setWechatUniId(turnBackDTOS.getWxData().getUnionId()); insertCustomer.setName(turnBackDTOS.getName()); + insertCustomer.setType(new Long(turnBackDTOS.getType())); insertCustomer.setAvatarUrl(turnBackDTOS.getWxData().getAvatarUrl()); insertCustomer.setExternalUserid(turnBackDTOS.getWxData().getUserId()); insertCustomer.setCpUserId(turnBackDTOS.getUserId()); 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 956d3d7..201d99c 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -627,7 +627,7 @@ public class EmployeeService { } } - turnBackDTO.setType(1); + turnBackDTO.setType(externalContact.getType()); turnBackDTO.setUserId(cpUserId); turnBackDTO.setName(externalContact.getName()); WxDataDTO wxDataDTO = new WxDataDTO();