diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 39c329a..c5a685d 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -623,13 +623,16 @@ public class JDUtil { // redisTemplate.delete(oldTimeTag); } + public void sendOrderToWxByOrderXDG(String order, String fromWxid) { + if ("消毒柜".equals(order)) { handleUserInteraction(fromWxid, order); return; } + + } /** * 接收京粉指令指令 */ public void sendOrderToWxByOrderJD(String order, String fromWxid) { - if ("消毒柜".equals(order)) { handleUserInteraction(fromWxid, order); return; } - int[] param = {-1}; + int[] param = {-1}; WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); String unionId = superAdmin.getUnionId(); List orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId)); diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java index 5c87e12..9175919 100644 --- a/src/main/java/cn/van/business/util/WxMessageConsumer.java +++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java @@ -288,11 +288,11 @@ public class WxMessageConsumer { } // 只处理超管的消息 String fromWxid = innerData.getFromWxid(); - //WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); - //if (Util.isEmpty(superAdmin)){ - // logger.info("不是超管消息,不处理"); - // return; - //} + WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid); + if (Util.isEmpty(superAdmin)){ + logger.info("不是超管消息,不处理"); + return; + } String msg = innerData.getMsg(); /** @@ -321,6 +321,8 @@ public class WxMessageConsumer { } } else if (msg.startsWith("京")) { jdUtils.sendOrderToWxByOrderJD(msg.replace("京", ""),fromWxid); + } else { + jdUtils.sendOrderToWxByOrderXDG(msg,fromWxid); } //else if (msg.startsWith("美团 ")) { // logger.info("处理美团的消息");