From 46a781ce5893496892e5faa6faf88b624f14e93c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 14:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2manager?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/ThirdRunTimeInfoConstant.java | 2 ++ .../main/java/com/epmet/dao/PaUserDao.java | 4 +-- .../service/impl/WarrantServiceImpl.java | 35 +++++++++++-------- .../src/main/resources/mapper/PaUserDao.xml | 7 ++-- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java index 1f896bae8f..2f0a2f103f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java @@ -107,4 +107,6 @@ public interface ThirdRunTimeInfoConstant { String TEXT_MESSAGE_LOG_INFO = "content：%s，content[1]：%s，fromUserName：%s，toUserName：%s"; String SEND_MESSAGE_XML = "要发送的xml内容为：%s"; + + String CONTENT = "content为：%s"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java index 49586a2370..c13d107b02 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaUserDao.java @@ -62,9 +62,9 @@ public interface PaUserDao extends BaseDao { /** * @Description 查询管理员基本信息 - * @param customerId + * @param userId * @author zxc * @date 2020/8/3 5:21 下午 */ - CustomerManagerFormDTO selectManagerInfo(@Param("customerId") String customerId); + CustomerManagerFormDTO selectManagerInfo(@Param("userId") String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index d5e2249cef..2adf60adeb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -147,21 +147,26 @@ public class WarrantServiceImpl implements WarrantService { Object createTime = xml.get(ModuleConstant.CREATE_TIME); Date date = componentVerifyTicketServiceImpl.sToDate(createTime.toString()); messagePushTextFormDTO.setWeChatCreateTime(date); - messagePushTextDao.insertMessageText(messagePushTextFormDTO); -// switch (messagePushTextFormDTO.getContent()){ -// //测试公众号处理用户消息 -// case ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT: -// -// -// } -// if (messagePushTextFormDTO.getContent().startsWith(ModuleConstant.QUERY_AUTH_CODE)){ -// // 测试公众号使用客服消息接口处理用户消息 -// String content = messagePushTextFormDTO.getContent(); -// String contentBefore = content.substring(NumConstant.ZERO, content.indexOf(ThirdRedisKeyConstant.COLON)); -// //auth_code -// String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length()); -// -// } +// messagePushTextDao.insertMessageText(messagePushTextFormDTO); + String content = messagePushTextFormDTO.getContent(); + log.info(String.format(ThirdRunTimeInfoConstant.CONTENT,content)); + + /** + * 测试公众号处理用户消息 + * 模拟粉丝发送文本消息给专用测试公众号，第三方平台方需根据文本消息的内容进行相应的响应： + * 1）微信模推送给第三方平台方：文本消息，其中 Content 字段的内容固定为：TESTCOMPONENT_MSG_TYPE_TEXT + * 2）第三方平台方立马回应文本消息并最终触达粉丝：Content 必须固定为：TESTCOMPONENT_MSG_TYPE_TEXT_callback + */ + if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){ + + + }else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){ + // 测试公众号使用客服消息接口处理用户消息 + String contentBefore = content.substring(NumConstant.ZERO, content.indexOf(ThirdRedisKeyConstant.COLON)); + //auth_code + String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length()); + + } } log.info("消息与事件接收URL【代码审核结果】结束......"); return ModuleConstant.SUCCESS; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserDao.xml index 4b67271ab7..ac662333c9 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserDao.xml @@ -58,12 +58,11 @@ pu.phone AS mobile FROM pa_user pu - LEFT JOIN customer_mp cm ON cm.created_by = pu.id + LEFT JOIN pa_customer_user_agency pcua ON pcua.user_id = pu.id WHERE pu.del_flag = '0' - AND cm.CUSTOMER_ID = #{customerId} - AND CM.DEL_FLAG = '0' - LIMIT 1 + AND pu.id = #{userId} + AND pcua.DEL_FLAG = '0' \ No newline at end of file