|
|
@@ -4,42 +4,38 @@ class OrderBaseDetail < ActiveRecord::Base
|
|
|
self.table_name = "order_base_details"
|
|
|
validates :order_no,:order_dt_id,:product_id, presence: true
|
|
|
# belongs_to :order, :foreign_key => :order_id
|
|
|
-
|
|
|
- def get_order_state(x)
|
|
|
- case x
|
|
|
- when "unpay"
|
|
|
- return "未支付"
|
|
|
- when "closed"
|
|
|
- return "已关闭"
|
|
|
- when "unconfirmed"
|
|
|
- return "待确认"
|
|
|
- when "processing"
|
|
|
- return "处理中"
|
|
|
- when "complete"
|
|
|
- return "已完成"
|
|
|
- when "dispatch"
|
|
|
- return "待收货"
|
|
|
- when "refunded"
|
|
|
- return "已退款"
|
|
|
- else
|
|
|
- return "--"
|
|
|
+ def dt_paid_time
|
|
|
+ paidTime = 0
|
|
|
+ order = Order.where("id = ?", self.order_id).first
|
|
|
+ if !order.blank?
|
|
|
+ paidTime=order.paied_at
|
|
|
end
|
|
|
+ return paidTime
|
|
|
end
|
|
|
|
|
|
|
|
|
- def get_order_pay_way(x)
|
|
|
- case x
|
|
|
- when "weixinpay"
|
|
|
- return "微信支付"
|
|
|
- when "balance"
|
|
|
- return "提货券支付"
|
|
|
- when "cent"
|
|
|
- return "积分支付"
|
|
|
- else
|
|
|
- return "--"
|
|
|
+ def dt_pay_way
|
|
|
+ payWay = ""
|
|
|
+ order = Order.where("id = ?", self.order_id).first
|
|
|
+ if !order.blank?
|
|
|
+ payWay=order.pay_way
|
|
|
end
|
|
|
+ return payWay
|
|
|
end
|
|
|
|
|
|
+ STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
|
|
|
+ PAY_WAY_ENUM = [
|
|
|
+ # ["Web网银连连支付","webbankllpay"],
|
|
|
+ # ["Web认证连连支付","webauthllpay"],
|
|
|
+ # ["Wap认证连连支付","wapauthllpay"],
|
|
|
+ ["微信支付","weixinpay"],
|
|
|
+ ["提货券支付","balance"],
|
|
|
+ # ["公众号微信支付","gzhwxpay"],
|
|
|
+ # ["公众号提货券支付","gzhbalance"],
|
|
|
+ # ["统统微信支付","wx_sumpay"],
|
|
|
+ # ["统统Web网银支付","webbanksumpay"],
|
|
|
+ ]
|
|
|
+
|
|
|
rails_admin do
|
|
|
navigation_label '订单基本明细'
|
|
|
weight -300
|
|
|
@@ -53,31 +49,17 @@ class OrderBaseDetail < ActiveRecord::Base
|
|
|
field :product_name
|
|
|
field :nums
|
|
|
field :order_dt_id
|
|
|
- field :dt_paid_time do
|
|
|
- filterable true
|
|
|
- formatted_value do
|
|
|
- #bindings[:object].order.paied_time
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- (bindings[:object].order.paied_at == 0 || bindings[:object].order.paied_at == nil) ? Time.at(0) : Time.at(bindings[:object].order.paied_at)
|
|
|
- end
|
|
|
- end
|
|
|
- end
|
|
|
-
|
|
|
- field :order_dt_state do
|
|
|
+ field :order_dt_state, :enum do
|
|
|
filterable true
|
|
|
- formatted_value do
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- bindings[:object].get_order_state(bindings[:object].order.status)
|
|
|
- end
|
|
|
- end
|
|
|
+ enum do
|
|
|
+ STATUS_ENUM
|
|
|
+ end
|
|
|
end
|
|
|
-
|
|
|
- field :dt_pay_way do
|
|
|
+ field :dt_paid_time
|
|
|
+ field :dt_pay_way, :enum do
|
|
|
filterable true
|
|
|
- formatted_value do
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- bindings[:object].get_order_pay_way(bindings[:object].order.pay_way)
|
|
|
- end
|
|
|
+ enum do
|
|
|
+ PAY_WAY_ENUM
|
|
|
end
|
|
|
end
|
|
|
field :send
|
|
|
@@ -109,33 +91,20 @@ class OrderBaseDetail < ActiveRecord::Base
|
|
|
bindings[:object].order.wx_user_id
|
|
|
end
|
|
|
end
|
|
|
- field :dt_paid_time do
|
|
|
+ field :order_dt_state, :enum do
|
|
|
filterable true
|
|
|
- formatted_value do
|
|
|
- #bindings[:object].order.paied_time
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- (bindings[:object].order.paied_at == 0 || bindings[:object].order.paied_at == nil) ? Time.at(0) : Time.at(bindings[:object].order.paied_at)
|
|
|
- end
|
|
|
+ enum do
|
|
|
+ STATUS_ENUM
|
|
|
end
|
|
|
end
|
|
|
-
|
|
|
- field :order_dt_state do
|
|
|
+ field :dt_paid_time
|
|
|
+ field :dt_pay_way, :enum do
|
|
|
filterable true
|
|
|
- formatted_value do
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- bindings[:object].get_order_state(bindings[:object].order.status)
|
|
|
- end
|
|
|
- end
|
|
|
- end
|
|
|
-
|
|
|
- field :dt_pay_way do
|
|
|
- filterable true
|
|
|
- formatted_value do
|
|
|
- if !bindings[:object].order.blank?
|
|
|
- bindings[:object].get_order_pay_way(bindings[:object].order.pay_way)
|
|
|
- end
|
|
|
+ enum do
|
|
|
+ PAY_WAY_ENUM
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
+
|
|
|
end
|
|
|
end
|