Ver código fonte

wx users add depart

abiao 5 anos atrás
pai
commit
10882ebe9a

+ 17 - 0
app/models/balance_order.rb

@@ -19,6 +19,8 @@ class BalanceOrder < ActiveRecord::Base
     ["统统Web网银支付","webbanksumpay"],
   ]
 
+  DEPART_ENUM= [["部门1",1], ["部门2",2], ["部门3", 3], ["部门4", 4], ["部门5", 5]]
+
   rails_admin do
     navigation_label '资金管理'
     parent Balance
@@ -60,6 +62,11 @@ class BalanceOrder < ActiveRecord::Base
       field :created_at
       field :updated_at
       field :balance_bank_card_no
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :remark
     end
 
@@ -91,6 +98,11 @@ class BalanceOrder < ActiveRecord::Base
       end
       field :balance_bank_card_no
       field :remark
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :created_at
     end
 
@@ -113,6 +125,11 @@ class BalanceOrder < ActiveRecord::Base
       end
       field :state
       field :balance_bank_card_no
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :remark
     end
   end

+ 16 - 0
app/models/order.rb

@@ -32,6 +32,7 @@ class Order < ActiveRecord::Base
     STATUS_ENUM = [["未支付","unpay"],["已关闭","closed"],["待确认","unconfirmed"],["处理中","processing"],["已完成","complete"],["待收货","dispatch"],["已退款","refunded"]]
     TYPE_ENUM = [["普通",0],["秒杀",1],["店长",2],["积分",3]]
     EXP_ENUM =  []
+    DEPART_ENUM= [["部门1",1], ["部门2",2], ["部门3", 3], ["部门4", 4], ["部门5", 5]]
 
     expressCompanys = ExpressCompany.order("id asc")
     expressCompanys.each do |exp|
@@ -205,6 +206,11 @@ class Order < ActiveRecord::Base
             end
             #field :order_details
             field :remark
+            field :depart, :enum do
+                enum do
+                    DEPART_ENUM
+                end
+            end
             field :created_at do
                 visible false
             end
@@ -256,6 +262,11 @@ class Order < ActiveRecord::Base
             field :order_remark
             field :dispatch_time
             field :receive_time
+            field :depart, :enum do
+                enum do
+                    DEPART_ENUM
+                end
+            end
             field :order_details
             field :created_at
             field :updated_at
@@ -302,6 +313,11 @@ class Order < ActiveRecord::Base
             field :remark
             field :order_remark
             field :dispatch_time
+            field :depart, :enum do
+                enum do
+                    DEPART_ENUM
+                end
+            end
          end
 
         export do

+ 17 - 0
app/models/shop_application.rb

@@ -2,9 +2,11 @@
 class ShopApplication < ActiveRecord::Base
   has_paper_trail
   self.table_name = "shop_applications"
+  DEPART_ENUM= [["部门1",1], ["部门2",2], ["部门3", 3], ["部门4", 4], ["部门5", 5]]
 
   IMG_STORE_PATH = "shop"
 
+
   rails_admin do
     navigation_label '店长申请记录'
     weight -500
@@ -29,6 +31,11 @@ class ShopApplication < ActiveRecord::Base
       field :status
       field :remark
       field :pass_time
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :created_at
       field :updated_at
     end
@@ -45,6 +52,11 @@ class ShopApplication < ActiveRecord::Base
       field :status
       field :remark
       field :pass_time
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :created_at
       field :updated_at
     end
@@ -60,6 +72,11 @@ class ShopApplication < ActiveRecord::Base
       field :status
       field :remark
       field :pass_time
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
     end
   end
 

+ 17 - 0
app/models/wx_user.rb

@@ -12,6 +12,8 @@ class WxUser < ActiveRecord::Base
   attr_accessor :invite, :v_head, :intro_user
 
   SEX_ENUM= [["未知","0"], ["男性","1"], ["女性", "2"]]
+  DEPART_ENUM= [["部门1",1], ["部门2",2], ["部门3", 3], ["部门4", 4], ["部门5", 5]]
+
   RANK_ENUM= [["普通会员","0"], ["群主","1"], ["店长", "2"]]
 
   COPARTNET_STATE_ENUM = [["否",0],["是",1],["曾经是",2]]
@@ -131,6 +133,11 @@ class WxUser < ActiveRecord::Base
       end
       field :sale_group
       field :sale_group_sum
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       # field :channel_qrcode_id
       field :created_at
     end
@@ -194,6 +201,11 @@ class WxUser < ActiveRecord::Base
       field :parent_signup_channel
       field :sale_group
       field :sale_group_sum
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
       field :created_at
     end
 
@@ -236,6 +248,11 @@ class WxUser < ActiveRecord::Base
           RANK_ENUM
         end
       end
+      field :depart, :enum do
+        enum do
+          DEPART_ENUM
+        end
+      end
     end
   end
   def get_head_img

+ 2 - 1
config/locales/models/balance_order.yml

@@ -19,4 +19,5 @@ zh-CN:
         remark: 备注
         created_at: 创建时间
         updated_at: 更新时间        
-        balance_bank_card_no: 充值银行卡
+        balance_bank_card_no: 充值银行卡
+        depart: 部门

+ 1 - 0
config/locales/models/order.yml

@@ -45,3 +45,4 @@ zh-CN:
        order_details: 商品明细
        created_at: 创建时间
        updated_at: 修改时间
+       depart: 部门

+ 1 - 0
config/locales/models/shop_application.yml

@@ -17,3 +17,4 @@ zh-CN:
         pass_time: 审核时间
         created_at: 创建时间
         updated_at: 更新时间
+        depart: 部门

+ 2 - 1
config/locales/models/wx_user.yml

@@ -40,4 +40,5 @@ zh-CN:
         gzhUnSubTime: 取消关注时间
         gzhLastConversationTime: 最近会话时间
         sale_group: 当月业绩
-        sale_group_sum: 上月业绩
+        sale_group_sum: 上月业绩
+        depart: 部门

+ 23 - 0
db/migrate/20201210114699_add_departs.rb

@@ -0,0 +1,23 @@
+# This migration and CreateVersionAssociations provide the necessary
+# schema for tracking associations.
+class AddDeparts < ActiveRecord::Migration
+  def up
+    add_column :wx_users, :depart, :integer
+    add_column :balance_orders, :depart, :integer
+    add_column :orders, :depart, :integer
+    add_column :shop_applications, :depart, :integer
+
+    add_index :wx_users, :depart
+    add_index :balance_orders, :depart
+    add_index :orders, :depart
+    add_index :shop_applications, :depart
+
+  end
+
+  def down
+    remove_column :wx_users, :depart
+    remove_column :balance_orders, :depart, :integer
+    remove_column :orders, :depart, :integer
+    remove_column :shop_applications, :depart, :integer
+  end
+end