Merge branch 'develop'

* develop:
  add base config function
  add base config function

app/models/balance.rb

@@ -15,6 +15,7 @@ class Balance < ActiveRecord::Base
                  ["全额退款", "all_refunded"],
                  ["部分退款", "part_refunded"],
                  ["部分退款", "part_refunded"],
+                 ["佣金转代金券","cash_to_balance"],
                  ["促销赠送","promotion"]]
 
   def remain_sum

app/models/cash_balance.rb

@@ -28,6 +28,7 @@ class CashBalance < ActiveRecord::Base
                  ["货款","good_payment"],
                  ["活动退款","dollar_win_return"],
                  ["活动报名","dollar_win"],
+                 ["佣金转代金券","cash_to_balance"],
                ]
 
   def remain_sum

app/models/order.rb

@@ -264,10 +264,13 @@ class Order < ActiveRecord::Base
          edit do 
             field :order_id
             field :wx_user_id
+            field :user_id
             field :total_price
             field :paied_price
             field :paied_at
             field :buy_price
+            field :paied_price
+            field :cent_price
             field :freight
             field :trade_no
             field :status, :enum do
@@ -288,6 +291,7 @@ class Order < ActiveRecord::Base
             field :tel 
             field :address
             field :contact
+
             #field :express_company
             field :express_company, :enum do
                 enum do