增加促销活动增加订单类型限制

app/models/promotion.rb

@@ -1,7 +1,7 @@
 class Promotion < ActiveRecord::Base
     has_paper_trail
     self.table_name = "promotions"
-    validates :begin_time,:end_time,:name, presence: true
+    validates :begin_time,:end_time,:name,:order_type, presence: true
 
     def prodcut1
       prd1 = Product.where("id = ?", self.prod1).first
@@ -60,6 +60,9 @@ class Promotion < ActiveRecord::Base
       end
     end
 
+    TYPE_ENUM = [["普通",0],["秒杀",1],["店长",2]]
+
+
     rails_admin do 
 
         navigation_label '商品管理'
@@ -73,6 +76,12 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
+          field :order_type, :enum do
+            filterable true
+            enum do
+              TYPE_ENUM
+            end
+          end
           field :min_total do
             label "订单最小金额（元）"
             formatted_value do # used in form views
@@ -103,8 +112,24 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
-          field :min_total
-          field :max_total
+          field :order_type, :enum do
+            filterable true
+            enum do
+              TYPE_ENUM
+            end
+          end
+          field :min_total do
+            label "订单最小金额（元）"
+            formatted_value do # used in form views
+              value.to_f / 100
+            end
+          end
+          field :max_total do
+            label "订单最大金额（元）"
+            formatted_value do # used in form views
+              value.to_f / 100
+            end
+          end
           field :prodcut1
           field :prodcut2
           field :prodcut3
@@ -123,6 +148,12 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
+          field :order_type, :enum do
+            filterable true
+            enum do
+              TYPE_ENUM
+            end
+          end
           field :min_total
           field :max_total
           field :prod1

config/locales/models/promotion.yml

@@ -9,6 +9,7 @@ zh-CN:
         end_time: 结束时间
         is_first: 是否首单
         is_more: 多买多送
+        order_type: 订单类型
         min_total: 订单最小金额（单位：分）
         max_total: 订单最大金额（单位：分）
         prod1: 买品1ID

db/migrate/20201102114643_create_promotions.rb

@@ -13,6 +13,8 @@ class CreatePromotions < ActiveRecord::Migration
       t.column :is_first, :boolean, :default=>1
       # 多买多送
       t.column :is_more, :boolean, :default=>1
+      # 订单类型
+      t.column :order_type, :integer, :limit => 11, :default => 0
       # 最小金额
       t.column :min_total, :integer, :limit => 11, :default => 0
       # 最大金额