afa 7 月之前
父节点
当前提交
e5893da875
共有 2 个文件被更改,包括 13 次插入4 次删除
  1. 1 1
      application/api/controller/Order.php
  2. 12 3
      application/common/model/ProductOrder.php

+ 1 - 1
application/api/controller/Order.php

@@ -242,7 +242,7 @@ class Order extends Api
 
             //修改:类型状态
             $order_info->type_id= $productOrder::Transfer; 
-            $order_info->status = $productOrder::Closure;
+            $order_info->status = $productOrder::Cancelled;
             $order_info->save();
             // 提交事务
             Db::commit();

+ 12 - 3
application/common/model/ProductOrder.php

@@ -29,8 +29,10 @@ class ProductOrder extends Model
     const Paid              = 1;
     const Transferred       = 2;
     const Shipped           = 3;
-    const Closure           = 4;
-    const Freeze            = 5;
+    const Cancelled         = 4; //取消
+    const Closure           = 5; //关闭
+    const Freeze            = 6; //质押
+
 
     //类型
     const Popular           = 0; //热销
@@ -193,7 +195,7 @@ class ProductOrder extends Model
             ['type_id'=>self::Giveaway, 'status'=> self::Closure, 'text' => __('已赠送')],
             ['type_id'=>self::Transfer, 'status'=> self::Closure, 'text' => __('已转让')], 
             ['type_id'=>self::Popular, 'status' => self::Shipped, 'text' => __('已提货')],
-            ['type_id'=>self::Transfer, 'status'=> self::Closure,'text' => __('已取消')],
+            ['type_id'=>self::Transfer, 'status'=> self::Cancelled,'text' => __('已取消')],
             ['type_id'=>self::Popular, 'status' => self::Freeze, 'text' => __('质押')],
             ['type_id'=>self::Transfer, 'status' => self::Paid, 'text' => __('购买寄售')],
             ['type_id'=>self::Airdrop, 'status' => self::Paid, 'text' => __('空投')],
@@ -202,6 +204,13 @@ class ProductOrder extends Model
             ['type_id'=>self::Synthesi, 'status' => self::Closure, 'text' => __('合成关闭')],
             ['type_id'=>self::Buying, 'status' => self::Paid, 'text' => __('求购')],
             ['type_id'=>self::Buying, 'status' => self::Closure, 'text' => __('求购关闭')],
+            ['type_id'=>self::Newbie, 'status' => self::Paid, 'text' => __('新人茶权')],
+            ['type_id'=>self::Newbie, 'status' => self::Closure, 'text' => __('新人茶权关闭')],
+            ['type_id'=>self::Super, 'status' => self::Paid, 'text' => __('新人福利')],
+            ['type_id'=>self::Super, 'status' => self::Closure, 'text' => __('新人福利关闭')],
+
+
+     
         ];
     }