Merge branch 'master' into pre

database/index.ts

@@ -375,7 +375,7 @@ class ChatCacheDatabaseController {
 
 
     public appendMessages(chat: number, items: Message[]) {
     public appendMessages(chat: number, items: Message[]) {
         return new Promise<void>((resolve) => {
         return new Promise<void>((resolve) => {
-            if (!this.db || !items.length) {
+            if (!this.db || !items || !items.length) {
                 return resolve();
                 return resolve();
             }
             }
             const store = this.buildChatMessageStore(chat);
             const store = this.buildChatMessageStore(chat);

service/order.ts

@@ -138,16 +138,19 @@ class OrderService {
                         r.pageData.rows,
                         r.pageData.rows,
                         orderPayItemPredict
                         orderPayItemPredict
                     );
                     );
-                    items = items.filter(
-                        (i) =>
-                            i.status !== PayStatus.Deleted &&
-                            i.status !== PayStatus.Cancel
-                    );
+                    if (!withActions) {
+                        items = items.filter(
+                            (i) =>
+                                i.status !== PayStatus.Deleted &&
+                                i.status !== PayStatus.Cancel
+                        );
+                    }
                     if (withActions) {
                     if (withActions) {
                         for (let i = 0; i < r.pageData.rows.length; i++) {
                         for (let i = 0; i < r.pageData.rows.length; i++) {
                             r.pageData &&
                             r.pageData &&
                                 r.pageData.rows &&
                                 r.pageData.rows &&
                                 r.pageData.rows[i] &&
                                 r.pageData.rows[i] &&
+                                items[i] &&
                                 (items[i].actions = r.pageData.rows[i].actions);
                                 (items[i].actions = r.pageData.rows[i].actions);
                         }
                         }
                     }
                     }