add balance promotion shop promotion

app/models/balance_promotion.rb

@@ -3,7 +3,7 @@ class BalancePromotion < ActiveRecord::Base
     self.table_name = "balance_promotions"
     belongs_to :depart_record, :foreign_key => :depart
 
-    validates :begin_time,:end_time,:name,:min_total,:max_total,:depart, presence: true
+    validates :begin_time,:end_time,:name,:min_total,:max_total, presence: true
     validate :product_validation
     attr_accessor :get_depart_enum
 

app/models/promotion.rb

@@ -2,6 +2,7 @@ class Promotion < ActiveRecord::Base
     has_paper_trail
     self.table_name = "promotions"
     validates :begin_time,:end_time,:name,:order_type, presence: true
+    belongs_to :depart_record, :foreign_key => :depart
 
     def prodcut1
       prd1 = Product.where("id = ?", self.prod1).first
@@ -116,6 +117,7 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
+          field :depart_record
           field :order_type, :enum do
             filterable true
             enum do
@@ -169,6 +171,7 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
+          field :depart_record
           field :order_type, :enum do
             filterable true
             enum do
@@ -211,6 +214,7 @@ class Promotion < ActiveRecord::Base
           field :end_time
           field :is_first
           field :is_more
+          field :depart_record
           field :order_type, :enum do
             filterable true
             enum do

app/models/shop_promotion.rb

@@ -3,7 +3,7 @@ class ShopPromotion < ActiveRecord::Base
     self.table_name = "shop_promotions"
     belongs_to :depart_record, :foreign_key => :depart
 
-    validates :begin_time,:end_time,:name,:total,:depart, presence: true
+    validates :begin_time,:end_time,:name,:total, presence: true
     validate :product_validation
     attr_accessor :get_depart_enum
 

config/locales/models/promotion.yml

@@ -45,5 +45,7 @@ zh-CN:
         send_prodcut5: 赠品5
         cash: 赠代办费(分)
         cent: 赠积分(分)
+        depart: 部门
+        depart_record: 部门
         created_at: 创建时间
         updated_at: 更新时间

db/migrate/20210325114688_create_recharge_promotions.rb

@@ -78,6 +78,7 @@ class CreateRechargePromotions < ActiveRecord::Migration
     add_column :balance_promotions, :max_total, :integer, :default=>0,:limit => 11
     add_column :balance_promotions, :depart, :integer, :null => false, :default=>0,:limit => 11
     add_column :balance_promotions, :is_more, :boolean, :default=>0,:limit => 4
+    add_column :promotions, :depart, :integer, :null => false, :default=>0,:limit => 11
 
 
   end