소스 검색

添加订单状态

shen 4 년 전
부모
커밋
7fe638cc8e
3개의 변경된 파일32개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 1
      app/models/base_detail.rb
  2. 8 2
      app/models/order_detail.rb
  3. 16 0
      db/migrate/20210819032357_add_order_status_column_to_base_details.rb

+ 8 - 1
app/models/base_detail.rb

@@ -38,6 +38,8 @@ class BaseDetail < ActiveRecord::Base
       return order.status
     end
   end
+  
+  STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
 
 
   def paid_time
@@ -96,7 +98,7 @@ class BaseDetail < ActiveRecord::Base
         end
       end
       field :product_name
-      field :order_state, :enum do
+      field :order_status, :enum do
         filterable true
         enum do
           STATUS_ENUM
@@ -116,6 +118,11 @@ class BaseDetail < ActiveRecord::Base
           PAY_WAY_ENUM
         end
       end
+     field :order_status, :enum do
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :is_zeng
       #field :size_name
       #field :color_name

+ 8 - 2
app/models/order_detail.rb

@@ -74,7 +74,7 @@ class OrderDetail < ActiveRecord::Base
     parent Order
     
     list do   
-      filters [:product,:order_no,:nums,:price,:order_state]
+      filters [:product,:order_no,:nums,:price,:order_status]
       field :id
       field :order_no do
         filterable true
@@ -93,7 +93,7 @@ class OrderDetail < ActiveRecord::Base
         end
       end
       field :product_name
-      field :order_state, :enum do
+      field :order_status, :enum do
         filterable true
         enum do
           STATUS_ENUM
@@ -141,6 +141,12 @@ class OrderDetail < ActiveRecord::Base
           value!=0 ? (value/100.0):0
         end
       end
+      field :order_status, :enum do
+        filterable true
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :product_name
       field :size_name
       field :color_name

+ 16 - 0
db/migrate/20210819032357_add_order_status_column_to_base_details.rb

@@ -0,0 +1,16 @@
+# This migration and CreateVersionAssociations provide the necessary
+# schema for tracking associations.
+class AddOrderStausColumnToBaseDetails < ActiveRecord::Migration
+  def self.up
+    add_column :base_details, :order_status,  :string, :limit => 64
+    add_column :order_details, :order_status,  :string, :limit => 64
+
+
+  end
+
+  def self.down
+    remove_column :base_details, :order_status
+    remove_column :order_details, :order_status
+
+  end
+end