Browse Source

增加订单导入功能

abiao 4 years ago
parent
commit
332ab267fa
1 changed files with 4 additions and 4 deletions
  1. 4 4
      app/models/order.rb

+ 4 - 4
app/models/order.rb

@@ -6,14 +6,14 @@ class Order < ActiveRecord::Base
     self.table_name = 'orders'
     validates_presence_of :wx_user_id,:total_price,:order_id
     #belongs_to :user, :foreign_key => :user_id
-    belongs_to :wx_user,:foreign_key => :wx_user_id
+    #belongs_to :wx_user
     belongs_to :depart_record, :foreign_key => :depart
 
     has_many :order_details
     has_many :base_details
     # has_and_belongs_to_many :products, join_table: :order_details
 
-    # before_save :before_save
+    before_save :before_save
     after_update :patch_send_product
     after_create :import_orders
 
@@ -213,7 +213,7 @@ class Order < ActiveRecord::Base
                 visible true
                 filterable true
             end
-            field :wx_user
+            #field :wx_user
             field :user_tel do
                 # visible false
             end
@@ -304,7 +304,7 @@ class Order < ActiveRecord::Base
                     PICK_WAY_ENUM
                 end
             end
-            field :wx_user
+            #field :wx_user
             field :wx_user_id
             field :freight do
                 visible true