大屏接口

src/main/java/com/kiisoo/ic/customer/CustomerService.java

@@ -314,7 +314,11 @@ public class CustomerService {
             opCustomer.setMemberId(opVip.getId());
         }
         QueryWrapper<OpCustomer> 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);
     }
 

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);
                     }
                 }