合并冲突

database/index.ts

@@ -16,6 +16,8 @@ class ChatCacheDatabaseController {
     private setuping = false;
     private setuping = false;
     private setupError = false;
     private setupError = false;
 
 
+    public readonly historyOrderModelName = 'order_info';
+
     private waitSetupCompleted() {
     private waitSetupCompleted() {
         return new Promise<void>((resolve, reject) => {
         return new Promise<void>((resolve, reject) => {
             const checker = () => {
             const checker = () => {

model/order.ts

 import { Chat } from "../xim/models/chat";
 import { Chat } from "../xim/models/chat";
+import { GeneralOrderDirection } from './order-product';
 
 
 export interface ChatGroup extends Chat {
 export interface ChatGroup extends Chat {
     children?: ChatGroup[];
     children?: ChatGroup[];
@@ -58,9 +59,13 @@ export interface OrderTableListItem {
     lastMsgContent: string;
     lastMsgContent: string;
     lastMsgTime: string;
     lastMsgTime: string;
     unreadCount: number;
     unreadCount: number;
-    PayPaymentNum?: string | number; //付款笔数
     logo?: string;
     logo?: string;
     orderId?: string;
     orderId?: string;
+    /**
+     * 付款笔数
+     */
+    PayPaymentNum?: string | number;
+    product: GeneralOrderDirection;
 }
 }
 
 
 export const orderPredict = {
 export const orderPredict = {
@@ -84,6 +89,7 @@ export const orderPredict = {
     lastMsgTime: "UniplatLastMsgTime",
     lastMsgTime: "UniplatLastMsgTime",
     unreadCount: 0,
     unreadCount: 0,
     PayPaymentNum: "PayPaymentNum",
     PayPaymentNum: "PayPaymentNum",
+    product: 'ProductId#product.Code'
 };
 };
 
 
 export const enum PayStatus {
 export const enum PayStatus {