Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/uniplat/customer-service

service/order.ts

@@ -10,6 +10,7 @@ import {
     UploadImageItem,
     UploadImageItem,
     orderPayItemPredict,
     orderPayItemPredict,
 } from "../model";
 } from "../model";
+import { GeneralOrderDirection } from '../model/order-product';
 
 
 class OrderService {
 class OrderService {
     public readonly generalOrder = "general_order_info";
     public readonly generalOrder = "general_order_info";
@@ -64,7 +65,7 @@ class OrderService {
     }
     }
 
 
     public getOrders(params: {
     public getOrders(params: {
-        productId?: number;
+        productId?: GeneralOrderDirection;
         index: number;
         index: number;
         size?: number;
         size?: number;
     }) {
     }) {
@@ -72,7 +73,7 @@ class OrderService {
             .model(this.generalOrder)
             .model(this.generalOrder)
             .list("userOrderList");
             .list("userOrderList");
         if (params.productId) {
         if (params.productId) {
-            list.addPrefilter({ ProductId: params.productId });
+            list.addPrefilter({ 'ProductId#product.Code': params.productId });
         }
         }
         return list
         return list
             .query({ item_size: params.size || 100, pageIndex: params.index })
             .query({ item_size: params.size || 100, pageIndex: params.index })