掉单通知修复+通道信息

.idea/vcs.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
 </project>

src/main/java/org/jebot/handler/impl/channel/ChannelBindGroupOrUnbindGroupHandler.java

@@ -36,9 +36,9 @@ public class ChannelBindGroupOrUnbindGroupHandler extends AbstractHandler {
         }
 
         //忽略商户群组消息
-        if (botMessage.isGroupMch()) {
-            return false;
-        }
+//        if (botMessage.isGroupMch()) {
+//            return false;
+//        }
 
         //需要管理员权限
         if (!botMessage.isUserAuthenticated()) {

src/main/java/org/jebot/handler/impl/channel/ChannelInfoHandler.java

@@ -43,9 +43,9 @@ public class ChannelInfoHandler extends AbstractHandler {
         }
 
         //忽略商户群组消息
-        if (botMessage.isGroupMch()) {
-            return false;
-        }
+//        if (botMessage.isGroupMch()) {
+//            return false;
+//        }
 
         if (botMessage.messageTextIsEmpty()) {
             return false;
@@ -126,7 +126,7 @@ public class ChannelInfoHandler extends AbstractHandler {
             String orderId = botMessage.getMessage().text().replace(QUERY_CHANNEL_ORDER_FLAG, "");
             PayOrder payOrder = this.handlerManager.getPayOrderRepository().findByPayOrderIdOrChannelOrderNo(orderId);
             if (payOrder == null) {
-                botMessage.getTelegramBot().execute(new SendMessage(botMessage.getMessage().chat().id(), "订单不存在"));
+                botMessage.getTelegramBot().execute(new SendMessage(botMessage.getMessage().chat().id(), "订单不存在3"));
                 return true;
             }
 

src/main/java/org/jebot/handler/impl/merchant/MerchantDropOrderHandler.java

@@ -16,6 +16,9 @@ public class MerchantDropOrderHandler extends AbstractHandler {
     @Override
     public boolean msgHandler(BotMessage botMessage) {
         //判断是否类似掉单待处理
+        if (!botMessage.getMessage().toString().contains("掉单")){
+            return false;
+        }
         if (botMessage.isContainsTextAndPhoto()) {
             //查询当前群组是否绑定商户号
             if (!botMessage.isGroupMch()) {