|
@@ -4,9 +4,16 @@ class Silver < ActiveRecord::Base
|
|
|
self.table_name = "silvers"
|
|
self.table_name = "silvers"
|
|
|
belongs_to :user
|
|
belongs_to :user
|
|
|
belongs_to :wx_user
|
|
belongs_to :wx_user
|
|
|
- validates_presence_of :user_id, :count, :relate_id, :source
|
|
|
|
|
|
|
+ validates_presence_of :wx_user_id, :count, :relate_id, :source
|
|
|
attr_accessor :remain_sum
|
|
attr_accessor :remain_sum
|
|
|
|
|
|
|
|
|
|
+ def before_save
|
|
|
|
|
+ wxUser = WxUser.where("id = ?", self.wx_user_id).first
|
|
|
|
|
+ if !wxUser.blank?
|
|
|
|
|
+ self.user_id = WxUser.user_id
|
|
|
|
|
+ end
|
|
|
|
|
+ end
|
|
|
|
|
+
|
|
|
SOURCE_ENUM = [["企业大使兑换", "platform_exchange"],
|
|
SOURCE_ENUM = [["企业大使兑换", "platform_exchange"],
|
|
|
["兑换商品", "exchange_product"],
|
|
["兑换商品", "exchange_product"],
|
|
|
["充值", "recharge"],
|
|
["充值", "recharge"],
|
|
@@ -34,11 +41,11 @@ class Silver < ActiveRecord::Base
|
|
|
|
|
|
|
|
list do
|
|
list do
|
|
|
items_per_page 10
|
|
items_per_page 10
|
|
|
- filters [:id, :source, :user, :relate_id,:wx_user,:created_at]
|
|
|
|
|
|
|
+ filters [:id, :source, :relate_id,:wx_user,:created_at]
|
|
|
# include_all_fields
|
|
# include_all_fields
|
|
|
field :id
|
|
field :id
|
|
|
field :user
|
|
field :user
|
|
|
- field :user_id
|
|
|
|
|
|
|
+ # field :user_id
|
|
|
field :wx_user
|
|
field :wx_user
|
|
|
field :wx_user_id
|
|
field :wx_user_id
|
|
|
field :count do
|
|
field :count do
|
|
@@ -63,7 +70,7 @@ class Silver < ActiveRecord::Base
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
show do
|
|
show do
|
|
|
- field :user_id
|
|
|
|
|
|
|
+ # field :user_id
|
|
|
field :wx_user
|
|
field :wx_user
|
|
|
field :wx_user_id
|
|
field :wx_user_id
|
|
|
field :count do
|
|
field :count do
|
|
@@ -87,7 +94,7 @@ class Silver < ActiveRecord::Base
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
edit do
|
|
edit do
|
|
|
- field :user_id
|
|
|
|
|
|
|
+ # field :user_id
|
|
|
field :wx_user_id
|
|
field :wx_user_id
|
|
|
field :count do
|
|
field :count do
|
|
|
label "变动金额,单位(分)"
|
|
label "变动金额,单位(分)"
|