diff --git a/src/main/java/cn/van/business/model/wx/SuperAdmin.java b/src/main/java/cn/van/business/model/wx/SuperAdmin.java index edf06c3..d74031e 100644 --- a/src/main/java/cn/van/business/model/wx/SuperAdmin.java +++ b/src/main/java/cn/van/business/model/wx/SuperAdmin.java @@ -61,6 +61,12 @@ public class SuperAdmin { @Column(name = "is_active", nullable = false) private Integer isActive = 1; + /** + * 接收人（企业微信用户ID，多个用逗号分隔） + */ + @Column(name = "touser", length = 500) + private String touser; + /** * 创建时间 */ diff --git a/src/main/java/cn/van/business/mq/MessageConsumerService.java b/src/main/java/cn/van/business/mq/MessageConsumerService.java index 0e8b226..0a4fb93 100644 --- a/src/main/java/cn/van/business/mq/MessageConsumerService.java +++ b/src/main/java/cn/van/business/mq/MessageConsumerService.java @@ -61,8 +61,9 @@ public class MessageConsumerService implements RocketMQListener { Integer msgType = data.getInteger("msgType"); String fromWxid = data.getString("fromWxid"); Boolean hiddenTime = data.getBoolean("hiddenTime"); + String touser = data.getString("touser"); // 获取接收人参数 - wxtsUtil.sendWxTextMessage(wxid, content, msgType, fromWxid, hiddenTime); + wxtsUtil.sendWxTextMessage(wxid, content, msgType, fromWxid, hiddenTime, touser); diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java index be5fc71..26740c6 100644 --- a/src/main/java/cn/van/business/util/OrderUtil.java +++ b/src/main/java/cn/van/business/util/OrderUtil.java @@ -68,9 +68,11 @@ public class OrderUtil { if (!isAutoFlush || !lastValidCode.equals(newValidCode)) { String content = getFormattedOrderInfo(orderRow); String wxId = getWxidFromJdid(orderRow.getUnionId().toString()); + // 根据unionId获取接收人列表 + String touser = WXUtil.getTouserByUnionId(orderRow.getUnionId().toString()); if (Util.isNotEmpty(wxId)) { - wxUtil.sendTextMessage(wxId, content, 1, wxId, true); + wxUtil.sendTextMessage(wxId, content, 1, wxId, true, touser); // 不是已完成，不是违规的才发送 if (newValidCode != 17 && newValidCode != 25 && newValidCode != 26 && newValidCode != 27 && newValidCode != 28) { // 发送今日统计信息 @@ -98,13 +100,15 @@ public class OrderUtil { } if (shouldNotify) { String wxId = getWxidFromJdid(orderRow.getUnionId().toString()); + // 根据unionId获取接收人列表 + String touser = WXUtil.getTouserByUnionId(orderRow.getUnionId().toString()); if (Util.isNotEmpty(wxId)) { String content = getFormattedOrderInfoForJB(orderRow); String alertMsg = "[爱心] 价保/赔付 ： " + newProPriceAmount + " [爱心] \n" + content; try { // 先发送通知 - wxUtil.sendTextMessage(wxId, alertMsg, 1, wxId, true); + wxUtil.sendTextMessage(wxId, alertMsg, 1, wxId, true, touser); // 通知成功后更新Redis，格式为 "金额:true" if (!isAutoFlushJB) { @@ -176,6 +180,8 @@ public class OrderUtil { if (!orderRowList.isEmpty()) { int i = 1; String wxId = getWxidFromJdid(orderRowList.get(0).getUnionId().toString()); + // 根据unionId获取接收人列表 + String touser = WXUtil.getTouserByUnionId(orderRowList.get(0).getUnionId().toString()); StringBuilder content = new StringBuilder(); content.append("批量订单：\n\r ").append(" 共 ").append(orderRowList.size()).append("单 \r"); List filterList = orderRowList.stream().filter(orderRow -> orderRow.getValidCode() != 2 && orderRow.getValidCode() != 3).toList(); @@ -187,7 +193,7 @@ public class OrderUtil { } if (Util.isNotEmpty(wxId)) { - wxUtil.sendTextMessage(wxId, content.toString(), 1, wxId, false); + wxUtil.sendTextMessage(wxId, content.toString(), 1, wxId, false, touser); } } @@ -247,6 +253,8 @@ public class OrderUtil { if (!orderRowList.isEmpty()) { int i = 1; String wxId = getWxidFromJdid(orderRowList.get(0).getUnionId().toString()); + // 根据unionId获取接收人列表 + String touser = WXUtil.getTouserByUnionId(orderRowList.get(0).getUnionId().toString()); StringBuilder content = new StringBuilder(); content.append("批量订单：\n\r ").append(" 共 ").append(orderRowList.size()).append("单 \r"); List filterList = orderRowList.stream().filter(orderRow -> orderRow.getValidCode() != 2 && orderRow.getValidCode() != 3).toList(); @@ -258,7 +266,7 @@ public class OrderUtil { } if (Util.isNotEmpty(wxId)) { - wxUtil.sendTextMessage(wxId, content.toString(), 1, wxId, false); + wxUtil.sendTextMessage(wxId, content.toString(), 1, wxId, false, touser); } } diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java index 617666f..0085021 100644 --- a/src/main/java/cn/van/business/util/WXUtil.java +++ b/src/main/java/cn/van/business/util/WXUtil.java @@ -133,6 +133,26 @@ public class WXUtil { return result; } + /** + * 根据unionId获取SuperAdmin的接收人列表 + * @param unionId 联盟ID + * @return 接收人列表（企业微信用户ID，多个用逗号分隔），如果未配置则返回null + */ + public static String getTouserByUnionId(String unionId) { + if (unionId == null || unionId.trim().isEmpty()) { + return null; + } + for (SuperAdmin admin : super_admins.values()) { + if (unionId.equals(admin.getUnionId())) { + String touser = admin.getTouser(); + if (touser != null && !touser.trim().isEmpty()) { + return touser.trim(); + } + } + } + return null; + } + public static List splitStringByLength(String input, int length) { List result = new ArrayList<>(); @@ -218,6 +238,10 @@ public class WXUtil { } public void sendTextMessage(String wxid, String content, Integer msgType, String fromwxid, Boolean hiddenTime) { + sendTextMessage(wxid, content, msgType, fromwxid, hiddenTime, null); + } + + public void sendTextMessage(String wxid, String content, Integer msgType, String fromwxid, Boolean hiddenTime, String touser) { // 全部打印 //logger.info("发送文本消息 msgType: {} wxid: {} fromwxid: {} content: {}", msgType, wxid, fromwxid, content); // 先在content顶部插入时间戳 @@ -264,6 +288,10 @@ public class WXUtil { data.put("msgType", msgType); data.put("fromWxid", fromwxid); data.put("hiddenTime", hiddenTime); + // 如果提供了接收人列表，添加到数据中 + if (touser != null && !touser.trim().isEmpty()) { + data.put("touser", touser.trim()); + } wxReqDate.setData(data); // wxReqDate 转成 JSONObject JSONObject message = JSON.parseObject(JSON.toJSONString(wxReqDate)); diff --git a/src/main/java/cn/van/business/util/WxtsUtil.java b/src/main/java/cn/van/business/util/WxtsUtil.java index 3262192..9bc87fb 100644 --- a/src/main/java/cn/van/business/util/WxtsUtil.java +++ b/src/main/java/cn/van/business/util/WxtsUtil.java @@ -59,11 +59,29 @@ public class WxtsUtil { * @param hiddenTime 是否隐藏时间戳 */ public void sendWxTextMessage(String wxid, String content, Integer msgType, String fromWxid, Boolean hiddenTime) { + sendWxTextMessage(wxid, content, msgType, fromWxid, hiddenTime, null); + } + + /** + * 发送微信文本消息到wxts接口（带接收人参数） + * @param wxid 接收者微信ID + * @param content 消息内容 + * @param msgType 消息类型 + * @param fromWxid 发送者微信ID + * @param hiddenTime 是否隐藏时间戳 + * @param touser 接收人列表（企业微信用户ID，多个用逗号分隔） + */ + public void sendWxTextMessage(String wxid, String content, Integer msgType, String fromWxid, Boolean hiddenTime, String touser) { try { String url = SERVER_URL + "/wx/send/jd"; HashMap paramMap = new HashMap<>(); paramMap.put("text", content); - + + // 如果提供了接收人列表，添加到参数中 + if (touser != null && !touser.trim().isEmpty()) { + paramMap.put("touser", touser.trim()); + logger.info("企业微信推送设置接收人 - 接收人: {}", touser); + } HttpResponse execute = HttpRequest.post(url) .header("vanToken", TOKEN) @@ -72,7 +90,7 @@ public class WxtsUtil { .execute(); if (execute.getStatus() == 200) { - logger.info("微信文本消息发送成功：wxid={}, content={}", wxid, content); + logger.info("微信文本消息发送成功：wxid={}, content={}, touser={}", wxid, content, touser); } else { logger.error("微信文本消息发送失败：status={}, response={}", execute.getStatus(), execute.body()); }