持有数量

application/common/model/ProductOrder.php

@@ -146,7 +146,7 @@ class ProductOrder extends Model
     //获取持有产品数量
     private static function getUserOrderNum(int $uid, int $product_id): int
     {
-        return  self::where('user_id', $uid)->where('product_id', $product_id)->where('type_id', self::Popular)->where('status', self::Paid)->sum('num');
+        return  self::where('user_id', $uid)->where('product_id', $product_id)->where('status', '<',self::Cancelled)->sum('num');
     }
 
     // 获取订单状态

public/assets/js/backend/offline/order.js

@@ -30,7 +30,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order_id', title: __('Order_id'), operate: false},
                         {field: 'products.zh_name', title: __('Product_id'),operate:'LIKE'},
                         {field: 'areas.address', title: __('Area_id')},
-                        {field: 'type_id', title: __('Type_id'), searchList: {0:__('热销'), 1:__('转让'), 2:__('赠送')}, formatter: Table.api.formatter.label},
+                        {field: 'type_id', title: __('Type_id'), 
+                            searchList: {
+                            0:__('热销'), 1:__('转让'), 2:__('赠送'),
+                            3:__('新人茶权空投'), 4:__('新人福利空投'), 5:__('空投'), 6:__('合成')
+                        }, formatter: Table.api.formatter.label
+                    },
                         {field: 'from_user', title: __('来源用户Id'), operate:false},
                         {field: 'price', title: __('Price'), operate:false},
                         {field: 'fees', title: __('手续费'), operate:false},

public/assets/js/backend/product/lists.js

@@ -62,7 +62,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'area', 'vue', 'ELEME
                         { field: 'is_gift', title: __('赠送'), searchList: { "1": __('开启'), "0": __('关闭') }, formatter: Table.api.formatter.toggle },
                         { field: 'is_freight', title: __('提货'), searchList: { "1": __('开启'), "0": __('关闭') }, formatter: Table.api.formatter.toggle },
                         { field: 'create_time', title: __('Create_time'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, formatter: Table.api.formatter.datetime },
-                        
                         { field: 'operate', title: __('Operate'),
                             buttons:[
                                 {