app/models/scale_device.rb

@@ -5,6 +5,15 @@ class ScaleDevice < ActiveRecord::Base
   belongs_to :wx_user
   #after_create :update_paied_time
 
+  def wx_user_contact
+    return "-" if wx_user.blank?
+    user = wx_user.user
+    return "-" if user.blank?
+    contact = user.tel
+    contact = user.email if contact.blank?
+    contact.blank? ? "-" : contact
+  end
+
   rails_admin do
     navigation_label '体脂秤管理'
     # parent Scale
@@ -14,7 +23,11 @@ class ScaleDevice < ActiveRecord::Base
       filters [:wx_user,:created_at]
       field :id
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :mac_addr
       field :created_at
       field :updated_at
@@ -22,7 +35,11 @@ class ScaleDevice < ActiveRecord::Base
 
     show do
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :mac_addr
       field :created_at
       field :updated_at

app/models/scale_result.rb

@@ -6,6 +6,15 @@ class ScaleResult < ActiveRecord::Base
   belongs_to :scale_user, :foreign_key => :user_id
   #after_create :update_paied_time
 
+  def wx_user_contact
+    return "-" if wx_user.blank?
+    user = wx_user.user
+    return "-" if user.blank?
+    contact = user.tel
+    contact = user.email if contact.blank?
+    contact.blank? ? "-" : contact
+  end
+
   rails_admin do
     navigation_label '测量记录'
     parent ScaleDevice
@@ -15,7 +24,11 @@ class ScaleResult < ActiveRecord::Base
       filters [:wx_user,:created_at]
       field :id
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :user_id
       field :scale_user
       field :result
@@ -25,7 +38,11 @@ class ScaleResult < ActiveRecord::Base
 
     show do
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :user_id
       field :scale_user
       field :result

app/models/scale_user.rb

@@ -3,12 +3,23 @@ class ScaleUser < ActiveRecord::Base
   has_paper_trail
   self.table_name = "scale_users"
   belongs_to :wx_user
+  has_many :scale_results, :foreign_key => :user_id, :dependent => :destroy
   attr_accessor :v_avatar
 
   #after_create :update_paied_time
   SEX_ENUM = [["男",0],["女",1]]
 
+  def wx_user_contact
+    return "-" if wx_user.blank?
+    user = wx_user.user
+    return "-" if user.blank?
+    contact = user.tel
+    contact = user.email if contact.blank?
+    contact.blank? ? "-" : contact
+  end
+
   def get_avatar_img
+    return "https://x-encrpt-bucket.s3.ap-southeast-2.amazonaws.com/encript/1766455493300.jpeg" if self.avatar.blank?
     url = "http://#{Ali::Oss::CDN_URL_FOR_HOST}/#{self.avatar}"
     return url
   end
@@ -21,7 +32,11 @@ class ScaleUser < ActiveRecord::Base
       filters [:wx_user,:created_at]
       field :id
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :nick_name
       field :avatar do
         formatted_value do
@@ -46,7 +61,11 @@ class ScaleUser < ActiveRecord::Base
 
     show do
       field :wx_user_id
-      field :wx_user
+      field :wx_user do
+        pretty_value do
+          bindings[:object].wx_user_contact
+        end
+      end
       field :nick_name
       field :avatar do
         formatted_value do

app/models/silver.rb

@@ -4,8 +4,16 @@ class Silver < ActiveRecord::Base
   self.table_name = "silvers"
   belongs_to :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
+  before_save :before_save
+
+  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"],
                  ["兑换商品", "exchange_product"],
@@ -34,11 +42,11 @@ class Silver < ActiveRecord::Base
 
     list do
       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
       field :id
       field :user
-      field :user_id
+      # field :user_id
       field :wx_user
       field :wx_user_id
       field :count do
@@ -63,7 +71,7 @@ class Silver < ActiveRecord::Base
     end
 
     show do
-      field :user_id
+      # field :user_id
       field :wx_user
       field :wx_user_id
       field :count do
@@ -87,7 +95,7 @@ class Silver < ActiveRecord::Base
     end
 
     edit do
-      field :user_id
+      # field :user_id
       field :wx_user_id
       field :count do
         label "变动金额，单位(分)"

app/models/user.rb

@@ -63,7 +63,8 @@ class User < ActiveRecord::Base
           :onClick => "javascript:window.open('#{bindings[:object].get_head}')"})
         end
       end
-      field :tel      
+      field :tel
+      field :email            
       field :province
       field :city
       field :signup_channel_id
@@ -83,6 +84,7 @@ class User < ActiveRecord::Base
       field :identity_card
       field :is_certification   
       field :tel
+      field :email     
       # field :pwd
       # field :trade_pwd
       field :birthday

config/locales/models/scale_result.yml

@@ -6,6 +6,7 @@ zh-CN:
       scale_result:
         id: ID
         wx_user: 微信用户
+        scale_user: 称用户名
         wx_user_id: 微信用户ID
         user: 称用户
         user_id: 称用户ID