代金券 改为 提货券

app/models/balance.rb

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

app/models/cash_balance.rb

@@ -6,7 +6,7 @@ class CashBalance < ActiveRecord::Base
   validates_presence_of :wx_uid, :count, :relate_id, :source
   attr_accessor :remain_sum
 
-  SOURCE_ENUM = [["代金券充值佣金", "balance_benefit"],
+  SOURCE_ENUM = [["提货券充值佣金", "balance_benefit"],
                  ["商品佣金", "product_benefit"],
                  ["店长申请", "shop_benefit"],
                  ["好友购物佣金", "fx_product_benefit"],
@@ -28,7 +28,7 @@ class CashBalance < ActiveRecord::Base
                  ["货款","good_payment"],
                  ["活动退款","dollar_win_return"],
                  ["活动报名","dollar_win"],
-                 ["佣金转代金券","cash_to_balance"],
+                 ["佣金转提货券","cash_to_balance"],
                ]
 
   def remain_sum

app/models/invite_benefit_order.rb

@@ -5,7 +5,7 @@ class InviteBenefitOrder < ActiveRecord::Base
   self.table_name = "invite_benefit_orders"  
   attr_accessor :wx_user_name, :ind_wx_user_name
 
-  SOURCE_ENUM = [["店长申请佣金","shop_benefit"],["代金券充值佣金","balance_benefit"],["邀请绑定","binding"],["直推商品佣金","product_benefit"],["分享商品佣金","fx_product_benefit"],["项目佣金","project_benefit"]]
+  SOURCE_ENUM = [["店长申请佣金","shop_benefit"],["提货券充值佣金","balance_benefit"],["邀请绑定","binding"],["直推商品佣金","product_benefit"],["分享商品佣金","fx_product_benefit"],["项目佣金","project_benefit"]]
 
   def wx_user_name
     u = WxUser.where(" id = ?", self.wx_uid).first

app/models/order.rb

@@ -41,7 +41,7 @@ class Order < ActiveRecord::Base
 
     PAY_WAY_ENUM = [
      ["微信支付","weixinpay"],
-     ["代金券支付","balance"],
+     ["提货券支付","balance"],
      ["积分支付","cent"],
     ]
 
@@ -96,16 +96,16 @@ class Order < ActiveRecord::Base
             return paied_price_f.to_s # + "元"
         when "balance"
             paied_price_f = self.paied_price!=0 ? ((self.paied_price)/100.0) :0
-            return paied_price_f.to_s #+ "代金券"
+            return paied_price_f.to_s #+ "提货券"
         when "integral"
             paied_price_f = self.paied_price!=0 ? ((self.paied_price)/100.0) :0
-            return paied_price_f.to_s #+ "代金券"
+            return paied_price_f.to_s #+ "提货券"
         end
     end
 
     def cent_price_format
         paied_price_f = self.cent_price!=0 ? ((self.cent_price)/100.0) :0
-        return paied_price_f.to_s #+ "代金券"
+        return paied_price_f.to_s #+ "提货券"
     end
 
     def coupon_price_format

app/models/order_detail.rb

@@ -36,9 +36,9 @@ class OrderDetail < ActiveRecord::Base
       # ["Web认证连连支付","webauthllpay"],
       # ["Wap认证连连支付","wapauthllpay"],
       ["微信支付","weixinpay"],
-      ["代金券支付","balance"],
+      ["提货券支付","balance"],
       # ["公众号微信支付","gzhwxpay"],
-      # ["公众号代金券支付","gzhbalance"],
+      # ["公众号提货券支付","gzhbalance"],
       # ["统统微信支付","wx_sumpay"],
       # ["统统Web网银支付","webbanksumpay"],
   ]

config/locales/models/balance.yml

@@ -1,7 +1,7 @@
 zh-CN:
   activerecord:
     models:
-      balance: 代金券账户
+      balance: 提货券账户
     attributes:
       balance:
         id: Id

config/locales/models/product.yml

@@ -14,7 +14,7 @@ zh-CN:
         product_cat: 商品分类
         detail: 商品详情
         price: 现金价格(分)
-        robo_balance_price: 代金券价格(代金券)
+        robo_balance_price: 提货券价格(提货券)
         buy_price: 采购价格(分)
         user_sale_price: 零售价(分)
         gross_interest_rate: 毛利率

db/migrate/20161017200001_create_users.rb

@@ -25,7 +25,7 @@ class CreateUsers < ActiveRecord::Migration
       t.integer  :invite_id
       t.integer  :signup_channel_id      
       t.string   :signup_ip
-      #是否黑名单，黑名单用户不能代金券和代金券支付商品
+      #是否黑名单，黑名单用户不能提货券和提货券支付商品
       t.boolean  :is_black_user, :default=>0
       t.timestamps
     end

db/migrate/20161031081834_create_balances.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# 我的代金券余额
+# 我的提货券余额
 class CreateBalances < ActiveRecord::Migration
   def self.up
     create_table :balances do |t|

db/migrate/20171110030458_create_products.rb

@@ -46,9 +46,9 @@ class CreateProducts < ActiveRecord::Migration
 
       	#外部现金价格(分)
       	t.column :price, :integer, :null=>false
-        #内部代金券价格(分)
+        #内部提货券价格(分)
         t.column :robo_balance_price, :integer, :null => false
-        #外部代金券价格(分)
+        #外部提货券价格(分)
         t.column :mall_balance_price, :integer, :null => false
 
       	#采购价格(分)
@@ -140,13 +140,13 @@ class CreateProducts < ActiveRecord::Migration
       t.column :wx_user_id, :integer, :null=>false
       #份数
       t.column :count, :integer, :null=>false
-      # 支付时商品的代金券单价
+      # 支付时商品的提货券单价
       t.column :unit_robo_balance_price, :integer, :null=>false
       # 支付时商品的现金单价
       t.column :unit_price, :integer, :null=>false
-    	#订单总价(单位) 根据支付方式来显示金钱分还是代金券还是代金券
+    	#订单总价(单位) 根据支付方式来显示金钱分还是提货券还是提货券
     	t.column :total_price, :integer, :null=>false
-    	#支付总价(单位) 根据支付方式来显示金钱分还是代金券还是代金券
+    	#支付总价(单位) 根据支付方式来显示金钱分还是提货券还是提货券
     	t.column :paied_price, :integer, :default=>0
       #进货总价(分)除以100就是元
       t.column :buy_price, :integer, :default=>0
@@ -156,7 +156,7 @@ class CreateProducts < ActiveRecord::Migration
     	t.column :trade_no, :string
     	#状态
     	t.column :status, :string
-    	#支付方式：微信、代金券、代金券;  weixinpay, balance, integral
+    	#支付方式：微信、提货券、提货券;  weixinpay, balance, integral
     	t.column :pay_way, :string
       #支付来源: 公众号 gzh、小程序 xcx、第五创系统d5c_sys
       t.column :source, :string