|
|
@@ -14,6 +14,7 @@ class OrderDetail < ActiveRecord::Base
|
|
|
self.errors.add(:product_id,"商品不存在,请重新填写商品ID")
|
|
|
else
|
|
|
self.product_name=prd.name
|
|
|
+ self.price=prd.price
|
|
|
end
|
|
|
end
|
|
|
|
|
|
@@ -37,10 +38,10 @@ class OrderDetail < ActiveRecord::Base
|
|
|
|
|
|
|
|
|
def paid_time
|
|
|
- paidTime = 0
|
|
|
order = Order.where("id = ?", self.order_id).first
|
|
|
if !order.blank?
|
|
|
- paidTime=order.paied_at
|
|
|
+ paidTime=order.paied_at == 0 || order.paied_at == nil ? Time.at(0) : Time.at(order.paied_at)
|
|
|
+ return paidTime
|
|
|
end
|
|
|
return paidTime
|
|
|
end
|
|
|
@@ -79,7 +80,10 @@ class OrderDetail < ActiveRecord::Base
|
|
|
filterable true
|
|
|
end
|
|
|
#field :order
|
|
|
- field :product
|
|
|
+ #field :product
|
|
|
+ field :product do
|
|
|
+ visible false
|
|
|
+ end
|
|
|
field :nums
|
|
|
field :price do
|
|
|
visible true
|