From c96bd945b7e3907e38f9d3e25bba50f148f6053f Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Sat, 25 Apr 2020 00:12:39 +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 --- .../ic/wx/service/WxResponseService.java | 27 ++++++++++--------- src/main/resources/application-prod.yml | 17 +++++++++--- .../PrivilageUserShopRelationDOMapper.xml | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java b/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java index 9e6b0a8..e9f8d1a 100644 --- a/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java +++ b/src/main/java/com/kiisoo/ic/wx/service/WxResponseService.java @@ -363,7 +363,7 @@ public class WxResponseService { String res = WeixinApi.getExternalContactInfo(externalUserID); log.info(res); //添加客户并添加店铺企业微信信息 - addExternalContact(res,state); + addExternalContact(res,userID,state); // welcomeCodeNode = root.getElementsByTagName("WelcomeCode"); // welcomeCode = welcomeCodeNode.item(0).getTextContent(); @@ -372,15 +372,19 @@ public class WxResponseService { break; case "add_half_external_contact": -// NodeList stateNode2 = root.getElementsByTagName("State"); -// if(stateNode2.getLength() > 0){ -// String state2 = stateNode2.item(0).getTextContent(); -// log.info(state2); -// } - log.info("add_half_external_contact 外部联系人添加了配置了客户联系功能且开启了免验证的成员时（此时成员尚未确认添加对方为好友），回调该事件"); + NodeList stateNodeHalf = root.getElementsByTagName("State"); + String statehalf = ""; + if(stateNodeHalf.getLength() > 0) { + statehalf = stateNodeHalf.item(0).getTextContent(); + log.info(statehalf); + } + log.info("add_external_contact 配置了客户联系功能的成员添加外部联系人时，回调该事件"); + // 调用外部联系人详情接口 查看state字段 - String res2 = WeixinApi.getExternalContactInfo(externalUserID); - log.info(res2); + String reshalf = WeixinApi.getExternalContactInfo(externalUserID); + log.info(reshalf); + //添加客户并添加店铺企业微信信息 + addExternalContact(reshalf,userID,statehalf); break; case "del_external_contact": log.info("del_external_contact 配置了客户联系功能的成员删除外部联系人时，回调该事件"); @@ -456,7 +460,7 @@ public class WxResponseService { * 添加客户 * @param res */ - public void addExternalContact(String res,String state) throws WxErrorException { + public void addExternalContact(String res,String cpUserId,String state) throws WxErrorException { OpCustomerEnterpriseWechat ocew = analyticCustomerEnterprise(res); ocew.setState(state); CustomerDTO customerDTO = new CustomerDTO(); @@ -469,8 +473,7 @@ public class WxResponseService { customerDTO.setShopCode(split[0]); customerDTO.setStaffCode(split[1]); }else{ - String cpuserId = ocew.getUserid(); - Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(cpuserId); + Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(cpUserId); PoiStore poiStore = poiStoreDOMapper.selectById(storeId); customerDTO.setShopCode(poiStore.getCode()); String staffCode = poiStoreStaffDOMapper.selectShopManagerByShop(storeId); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index dbd0cdd..ac2b06f 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,3 +1,7 @@ +logging: + level: + root: info + mybatis: mapperLocations: classpath:mapper/*.xml @@ -7,7 +11,14 @@ logging: spring: datasource: - url: jdbc:mysql://10.173.32.71:3306/p2p?characterEncoding=utf8&allowMultiQueries=true - username: kiisoo - password: QS_db_123 + url: jdbc:mysql://10.101.8.44/ic?characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true + username: root + password: root driver-class-name: com.mysql.jdbc.Driver + + +##开发环境 +server: + port: 8080 + servlet: + context-path: /kiisoo-ic diff --git a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml index eefe1dd..df4dd0b 100644 --- a/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml +++ b/src/main/resources/mapper/PrivilageUserShopRelationDOMapper.xml @@ -28,7 +28,7 @@ group by t1.staff_code