修复掉单转发

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(), "订单不存在3"));
+                botMessage.getTelegramBot().execute(new SendMessage(botMessage.getMessage().chat().id(), "订单不存在"));
                 return true;
             }
 

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

@@ -16,9 +16,9 @@ public class MerchantDropOrderHandler extends AbstractHandler {
     @Override
     public boolean msgHandler(BotMessage botMessage) {
         //判断是否类似掉单待处理
-        if (!botMessage.getMessage().toString().contains("掉单")){
-            return false;
-        }
+//        if (!botMessage.getMessage().toString().contains("掉单")){
+//            return false;
+//        }
         if (botMessage.isContainsTextAndPhoto()) {
             //查询当前群组是否绑定商户号
             if (!botMessage.isGroupMch()) {
@@ -28,10 +28,10 @@ public class MerchantDropOrderHandler extends AbstractHandler {
             //如果商户号存在，查询订单所属上游
             PayOrder payOrder = handlerManager.getPayOrderRepository().findByPayOrderIdOrMchOrderNo(botMessage.getMessage().caption().trim(), botMessage.getBotGroup().getDataId());
             if (payOrder == null) {
-                SendMessage sendMessage = new SendMessage(botMessage.getMessage().chat().id(), "订单不存在");
-                sendMessage.replyParameters(new ReplyParameters(botMessage.getMessage().messageId()));
-                botMessage.getTelegramBot().execute(sendMessage);
-                return true;
+//                SendMessage sendMessage = new SendMessage(botMessage.getMessage().chat().id(), "订单不存在");
+//                sendMessage.replyParameters(new ReplyParameters(botMessage.getMessage().messageId()));
+//                botMessage.getTelegramBot().execute(sendMessage);
+                return false;
             }
 
             //获取通道id

src/main/java/org/jebot/models/xxpay/PayOrder.java

@@ -162,8 +162,8 @@ public class PayOrder {
     @Column(name = "PaySuccTime")
     private Date paySuccTime;
 
-    @Column(name = "PayOpenTime")
-    private Date payOpenTime;
+//    @Column(name = "PayOpenTime")
+//    private Date payOpenTime;
 
     @Column(name = "CreateTime")
     private Date createTime;

src/main/resources/application.yml

@@ -3,10 +3,10 @@ server:
 # 机器人配置
 telegram:
   bot:
-    token: "8185747478:AAHjhpvGgLy6pwj3g3QquTsp21WB4N60pjM"
+#    token: "8185747478:AAHjhpvGgLy6pwj3g3QquTsp21WB4N60pjM"
 
     #印度
-#    token: 8223554708:AAF61EA1TfOD4TXfm9QIbb21hqcCTATf0jE
+    token: 8223554708:AAF61EA1TfOD4TXfm9QIbb21hqcCTATf0jE
     #小易
     #    token: "8057879283:AAF5sta5RKgI_HvFqw86-mraHg7fD6p0UQ4"
     #百事
@@ -22,14 +22,14 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver         # mysql驱动
 
 
-      jdbc-url: jdbc:mysql://127.0.0.1:3306/jebot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-      username: root
-      password: SAu961102
+#      jdbc-url: jdbc:mysql://127.0.0.1:3306/jebot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+#      username: root
+#      password: SAu961102
 
       #印度
-#      jdbc-url: jdbc:mysql://127.0.0.1:3306/jebot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#      username: jebot
-#      password: 6BSRrKfGcRCSN8bR
+      jdbc-url: jdbc:mysql://127.0.0.1:3306/jebot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+      username: jebot
+      password: 6BSRrKfGcRCSN8bR
 
       #小易
 #      jdbc-url: jdbc:mysql://rm-3nsku90lhvto0h705.mysql.rds.aliyuncs.com/jebot?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
@@ -55,9 +55,9 @@ spring:
       type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
       driver-class-name: com.mysql.cj.jdbc.Driver         # mysql驱动
 
-      jdbc-url: jdbc:mysql://127.0.0.1:3306/xxpay4pro_xx?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-      username: root
-      password: SAu961102
+#      jdbc-url: jdbc:mysql://127.0.0.1:3306/xxpay4pro_main?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+#      username: root
+#      password: SAu961102
 
       #小易
 #      jdbc-url: jdbc:mysql://rm-3nsku90lhvto0h705.mysql.rds.aliyuncs.com/xiaoyixxpay?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
@@ -69,9 +69,9 @@ spring:
 #      password: Ltadmin123
 
 #印度
-#      jdbc-url: jdbc:mysql://rm-3nsku90lhvto0h705.mysql.rds.aliyuncs.com/gdspay?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
-#      username: bayue
-#      password: bvuzCeQMDVb^sy6W
+      jdbc-url: jdbc:mysql://rm-3nsku90lhvto0h705.mysql.rds.aliyuncs.com/gdspay?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
+      username: bayue
+      password: bvuzCeQMDVb^sy6W
 
       hikari:
         connection-timeout: 30000        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒