abiao лет назад: 4
Родитель
Сommit
8ecc576b4b
1 измененных файлов с 13 добавлено и 18 удалено
  1. 13 18
      app/models/order_base_detail.rb

+ 13 - 18
app/models/order_base_detail.rb

@@ -6,7 +6,7 @@ class OrderBaseDetail < ActiveRecord::Base
   belongs_to :order, :foreign_key => :order_id
 
   def order_state
-    order = Order.where("id = ?", self.order_id).first
+    order = Order.where("order_id = ?", self.order_no).first
     if !order.blank?
       return order.status
     end
@@ -15,13 +15,23 @@ class OrderBaseDetail < ActiveRecord::Base
 
   def pay_way
     payWay = ""
-    order = Order.where("id = ?", self.order_id).first
+    order = Order.where("order_id = ?", self.order_no).first
     if !order.blank?
       payWay=order.pay_way
     end
     return payWay
   end
 
+
+  def paid_time
+    paidTime = 0
+    order = Order.where("order_id = ?", self.order_no).first
+    if !order.blank?
+      paidTime=order.paied_at
+    end
+    return paidTime
+  end
+
   STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
   PAY_WAY_ENUM = [
       ["微信支付","weixinpay"],
@@ -41,22 +51,7 @@ class OrderBaseDetail < ActiveRecord::Base
       field :title
       field :nums
       field :order_dt_id
-=begin
-      field :order_state, :enum do
-        #filterable true
-        enum do
-          STATUS_ENUM
-        end
-      end
-=end
-=begin
-      field :pay_way, :enum do
-        # filterable true
-        enum do
-          PAY_WAY_ENUM
-        end
-      end
-=end
+      field :paid_time
       field :send
     end
     show do