|
|
@@ -4,7 +4,7 @@ require 'rest-client'
|
|
|
class Order < ActiveRecord::Base
|
|
|
has_paper_trail
|
|
|
self.table_name = 'orders'
|
|
|
- validates_presence_of :user_id,:wx_user_id,:total_price,:order_id
|
|
|
+ validates_presence_of :user_id,:wx_user_id,:total_price,:order_id,:status
|
|
|
#belongs_to :user, :foreign_key => :user_id
|
|
|
belongs_to :wx_user
|
|
|
belongs_to :depart_record, :foreign_key => :depart
|
|
|
@@ -35,7 +35,7 @@ class Order < ActiveRecord::Base
|
|
|
|
|
|
|
|
|
def patch_send_product
|
|
|
- if self.order_type=="processing"
|
|
|
+ if self.status=="processing"
|
|
|
#发放未发放赠品
|
|
|
url = "#{CONFIG_FILE["api_host"]}/railsadmin/live/award/#{self.id}"
|
|
|
p url
|
