瀏覽代碼

order base detail export edit

abiao 4 年之前
父節點
當前提交
c18e5c7611
共有 2 個文件被更改,包括 12 次插入4 次删除
  1. 5 1
      app/models/base_detail.rb
  2. 7 3
      app/models/order_detail.rb

+ 5 - 1
app/models/base_detail.rb

@@ -14,6 +14,7 @@ class BaseDetail < ActiveRecord::Base
         self.errors.add(:product_id,"商品不存在,请重新填写商品ID")
       else
         self.product_name=prd.name
+        self.price=prd.price
       end
     end
 
@@ -79,7 +80,10 @@ class BaseDetail < ActiveRecord::Base
         filterable true
       end
       #field :order
-      field :product
+      #field :product
+      field :product do
+        visible false
+      end
       field :nums
       field :price do
         visible true

+ 7 - 3
app/models/order_detail.rb

@@ -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