|
@@ -123,6 +123,7 @@ class Order < ActiveRecord::Base
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
def w_user
|
|
def w_user
|
|
|
|
|
+ wx_user = WxUser.where("id = ?", self.wx_user_id).first
|
|
|
if !wx_user.blank?
|
|
if !wx_user.blank?
|
|
|
return wx_user.nickname
|
|
return wx_user.nickname
|
|
|
else
|
|
else
|
|
@@ -213,7 +214,7 @@ class Order < ActiveRecord::Base
|
|
|
visible true
|
|
visible true
|
|
|
filterable true
|
|
filterable true
|
|
|
end
|
|
end
|
|
|
- #field :wx_user
|
|
|
|
|
|
|
+ field :w_user
|
|
|
field :user_tel do
|
|
field :user_tel do
|
|
|
# visible false
|
|
# visible false
|
|
|
end
|
|
end
|
|
@@ -304,7 +305,7 @@ class Order < ActiveRecord::Base
|
|
|
PICK_WAY_ENUM
|
|
PICK_WAY_ENUM
|
|
|
end
|
|
end
|
|
|
end
|
|
end
|
|
|
- #field :wx_user
|
|
|
|
|
|
|
+ field :w_user
|
|
|
field :wx_user_id
|
|
field :wx_user_id
|
|
|
field :freight do
|
|
field :freight do
|
|
|
visible true
|
|
visible true
|
