增加物流自提

app/models/depart_record.rb

@@ -32,6 +32,9 @@ class DepartRecord < ActiveRecord::Base
         filterable true
       end
       field :wx_user
+      field :pick
+      field :pick_address
+      field :pick_title
       field :remark
       field :created_at
       field :updated_at
@@ -45,6 +48,9 @@ class DepartRecord < ActiveRecord::Base
       end
       field :wx_user
       field :remark
+      field :pick
+      field :pick_address
+      field :pick_title
       field :created_at
       field :updated_at
     end
@@ -52,6 +58,9 @@ class DepartRecord < ActiveRecord::Base
     edit do
       field :name
       field :wx_user_id
+      field :pick
+      field :pick_address
+      field :pick_title
       field :remark
     end
   end

app/models/order.rb

@@ -72,6 +72,10 @@ class Order < ActiveRecord::Base
      ["积分支付","cent"],
     ]
 
+    PICK_WAY_ENUM = [
+        ["快递运输",0],
+        ["门店自提",1],
+    ]
     SOURCE_ENUM = [["小程序","xcx"],["公众号","gzh"],["第五创系统","d5c_sys"]]
 
     def user_tel
@@ -158,6 +162,11 @@ class Order < ActiveRecord::Base
             field :order_id do
                 filterable true
             end
+            field :pick_way, :enum do
+                enum do
+                    PICK_WAY_ENUM
+                end
+            end
             #field :order_id
             field :order_type, :enum do 
                 filterable true
@@ -259,6 +268,11 @@ class Order < ActiveRecord::Base
         show do
             field :id
             field :order_id
+            field :pick_way, :enum do
+                enum do
+                    PICK_WAY_ENUM
+                end
+            end
             field :wx_user
             field :wx_user_id
             field :freight do
@@ -319,6 +333,11 @@ class Order < ActiveRecord::Base
         
          edit do 
             field :order_id
+            field :pick_way, :enum do
+                enum do
+                    PICK_WAY_ENUM
+                end
+            end
             field :wx_user_id
             field :user_id
             field :total_price

app/models/pick_address.rb

@@ -0,0 +1,43 @@
+# encoding:utf-8
+class PickAddress < ActiveRecord::Base
+  has_paper_trail
+  self.table_name = "pick_addresses"
+  belongs_to :wx_user, :foreign_key => :wx_user_id
+
+
+
+  rails_admin do
+    navigation_label '用户信息管理'
+    weight -55
+    list do
+      filters [:user,:tel,:contact]
+      field :id
+      field :wx_user
+      field :contact
+      field :tel
+      field :state
+      field :remark
+      # field :created_at
+      field :updated_at
+  end
+
+    show do   
+      field :id
+      field :wx_user_id
+      field :wx_user
+      field :tel
+      field :state
+      field :remark
+      field :created_at
+      field :updated_at
+    end
+
+    edit do
+      field :wx_user_id
+      field :tel
+      field :contact
+      field :state
+      field :remark
+    end
+  end
+end

config/locales/models/depart_record.yml

@@ -9,6 +9,9 @@ zh-CN:
         wx_user_id: 微信ID
         name: 部门名称
         inner_no: 内部编号
+        pick: 是否自提点
+        pick_address: 自提地址
+        pick_title: 自提点名称
         remark: 备注
         created_at: 创建时间
         updated_at: 更新时间

config/locales/models/order.yml

@@ -7,6 +7,9 @@ zh-CN:
        id: ID 
        order_id: 订单号
        order_type: 类型
+       pick_way: 物流方式
+       pick_dept: 自提门店ID
+       pick_dept_name: 自提门店
        wx_user_id: 微信ID
        user_id: 用户ID
        user: 用户

config/locales/models/pic_address.yml

@@ -0,0 +1,15 @@
+zh-CN:
+  activerecord:
+    models:
+      pick_address: 提货地址管理
+    attributes:
+      pick_address: 
+        id: ID
+        wx_user_id: 微信用户ID
+        wx_user: 微信用户
+        contact: 联系人
+        tel: 电话
+        remark: 备注
+        state: 状态
+        created_at: 创建时间
+        updated_at: 更新时间

db/migrate/20210825030458_create_pick_addresss.rb

@@ -0,0 +1,37 @@
+# encoding:utf-8
+# 提货信息表
+class CreatePickAddresss < ActiveRecord::Migration
+  def up
+    create_table :pick_addresses do |t|
+
+      #微信用户id
+      t.integer :wx_user_id
+      #联系人
+      t.string :contact
+      #联系电话
+      t.string :tel
+      #备注
+      t.string :remark
+      #是否默认地址
+      t.boolean :state, :default => false
+      t.timestamps
+    end
+    add_index  :pick_addresses, :wx_user_id
+    add_column :orders, :pick_way,  :int, :limit => 11, :default => 0
+    add_column :orders, :pick_dept,  :int, :limit => 11, :default => 0
+    add_column :depart_records, :pick_title, :string, :limit => 128
+    add_column :depart_records, :pick_addresses, :string, :limit => 128
+    add_column :depart_records, :pick, :boolean, :default=>false
+
+  end
+
+  def down
+    drop_table :pick_addresses
+    remove_column :orders, :pick_way
+    remove_column :orders, :pick_dept
+    remove_column :depart_records, :pick_title
+    remove_column :depart_records, :pick_addresses
+    remove_column :depart_records, :pick
+
+  end
+end