|
@@ -113,11 +113,11 @@ public class BotRest {
|
|
List<PayOrder> payOrderList = handlerManager.getPayOrderRepository()
|
|
List<PayOrder> payOrderList = handlerManager.getPayOrderRepository()
|
|
.findSuccessPayOrderByPassageIdAndCreateTime(mchGroup.getDataId(), todayMidnight, endDate);
|
|
.findSuccessPayOrderByPassageIdAndCreateTime(mchGroup.getDataId(), todayMidnight, endDate);
|
|
|
|
|
|
- if (payOrderList.isEmpty()) {
|
|
|
|
- messageText.append(mchAccount.getPassageName()).append(": 无订单数据\n");
|
|
|
|
- sendMessageAndLog(message, messageText.toString());
|
|
|
|
- continue; // 处理下一个群组
|
|
|
|
- }
|
|
|
|
|
|
+// if (payOrderList.isEmpty()) {
|
|
|
|
+// messageText.append(mchAccount.getPassageName()).append(": 无订单数据\n");
|
|
|
|
+// sendMessageAndLog(message, messageText.toString());
|
|
|
|
+// continue; // 处理下一个群组
|
|
|
|
+// }
|
|
|
|
|
|
// 执行结算
|
|
// 执行结算
|
|
SettlementPassage(message, mchGroup, payOrderList, todayMidnight, endDate);
|
|
SettlementPassage(message, mchGroup, payOrderList, todayMidnight, endDate);
|
|
@@ -204,10 +204,10 @@ public class BotRest {
|
|
List<PayOrder> payOrderList = handlerManager.getPayOrderRepository()
|
|
List<PayOrder> payOrderList = handlerManager.getPayOrderRepository()
|
|
.findSuccessPayOrderByMchIdAndCreateTime(mchGroup.getDataId(), todayMidnight, endDate);
|
|
.findSuccessPayOrderByMchIdAndCreateTime(mchGroup.getDataId(), todayMidnight, endDate);
|
|
|
|
|
|
- if (payOrderList.isEmpty()) {
|
|
|
|
- messageText.append(mchAccount.getName()).append(": 无订单数据\n");
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
|
|
+// if (payOrderList.isEmpty()) {
|
|
|
|
+// messageText.append(mchAccount.getName()).append(": 无订单数据\n");
|
|
|
|
+// continue;
|
|
|
|
+// }
|
|
BotMessage message = new BotMessage();
|
|
BotMessage message = new BotMessage();
|
|
message.setBotGroup(mchGroup);
|
|
message.setBotGroup(mchGroup);
|
|
message.setTelegramBot(telegramBot);
|
|
message.setTelegramBot(telegramBot);
|