1
This commit is contained in:
@@ -623,13 +623,16 @@ public class JDUtil {
|
|||||||
// redisTemplate.delete(oldTimeTag);
|
// redisTemplate.delete(oldTimeTag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void sendOrderToWxByOrderXDG(String order, String fromWxid) {
|
||||||
|
if ("消毒柜".equals(order)) { handleUserInteraction(fromWxid, order); return; }
|
||||||
|
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* 接收京粉指令指令
|
* 接收京粉指令指令
|
||||||
*/
|
*/
|
||||||
public void sendOrderToWxByOrderJD(String order, String fromWxid) {
|
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);
|
WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid);
|
||||||
String unionId = superAdmin.getUnionId();
|
String unionId = superAdmin.getUnionId();
|
||||||
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId));
|
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDescAndUnionId(param, Long.valueOf(unionId));
|
||||||
|
|||||||
@@ -288,11 +288,11 @@ public class WxMessageConsumer {
|
|||||||
}
|
}
|
||||||
// 只处理超管的消息
|
// 只处理超管的消息
|
||||||
String fromWxid = innerData.getFromWxid();
|
String fromWxid = innerData.getFromWxid();
|
||||||
//WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid);
|
WXUtil.SuperAdmin superAdmin = super_admins.get(fromWxid);
|
||||||
//if (Util.isEmpty(superAdmin)){
|
if (Util.isEmpty(superAdmin)){
|
||||||
// logger.info("不是超管消息,不处理");
|
logger.info("不是超管消息,不处理");
|
||||||
// return;
|
return;
|
||||||
//}
|
}
|
||||||
String msg = innerData.getMsg();
|
String msg = innerData.getMsg();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -321,6 +321,8 @@ public class WxMessageConsumer {
|
|||||||
}
|
}
|
||||||
} else if (msg.startsWith("京")) {
|
} else if (msg.startsWith("京")) {
|
||||||
jdUtils.sendOrderToWxByOrderJD(msg.replace("京", ""),fromWxid);
|
jdUtils.sendOrderToWxByOrderJD(msg.replace("京", ""),fromWxid);
|
||||||
|
} else {
|
||||||
|
jdUtils.sendOrderToWxByOrderXDG(msg,fromWxid);
|
||||||
}
|
}
|
||||||
//else if (msg.startsWith("美团 ")) {
|
//else if (msg.startsWith("美团 ")) {
|
||||||
// logger.info("处理美团的消息");
|
// logger.info("处理美团的消息");
|
||||||
|
|||||||
Reference in New Issue
Block a user