From bd2a207c68998071c92a2fc621d906b4a9bc09e9 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Thu, 14 May 2020 14:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kiisoo/ic/customer/CustomerService.java | 6 +++++- .../kiisoo/ic/employee/service/EmployeeService.java | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index f0514c7..1fb1e6e 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -314,7 +314,11 @@ public class CustomerService { opCustomer.setMemberId(opVip.getId()); } QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.eq("wechat_uni_id", turnBackDTO.getWxData().getUnionId()); + if (turnBackDTO.getType() == 1){ + wrapper1.eq("wechat_uni_id", turnBackDTO.getWxData().getUnionId()); + }else{ + wrapper1.eq("external_userid", turnBackDTO.getWxData().getUserId()); + } opCustomerDOMapper.update(opCustomer, wrapper1); } 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 201d99c..f2b0d82 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -523,19 +523,15 @@ public class EmployeeService { } } - turnBackDTO.setType(1); + turnBackDTO.setType(externalContact.getType()); turnBackDTO.setUserId(cpUserId); turnBackDTO.setName(externalContact.getName()); WxDataDTO wxDataDTO = new WxDataDTO(); wxDataDTO.setAvatarUrl(externalContact.getAvatar()); wxDataDTO.setUserId(externalContact.getExternalUserId()); - if (externalContact.getUnionId() != null){ - wxDataDTO.setUnionId(externalContact.getUnionId()); - } + wxDataDTO.setUnionId(externalContact.getUnionId()); turnBackDTO.setWxData(wxDataDTO); -// HttpResult httpResult = HttpClientUtil.httpPost("http://127.0.0.1:8080/kiisoo-ic/api/ics/customer", JSONObject.toJSONString(turnBackDTO)); -// String message = httpResult.getMessage(); -// message + customerService.turnBack(turnBackDTO); } }