|
|
@@ -102,6 +102,7 @@ class Order < ActiveRecord::Base
|
|
|
|
|
|
PAY_WAY_ENUM = [
|
|
|
["微信支付","weixinpay"],
|
|
|
+ ["通联支付","allinpay"],
|
|
|
["提货券支付","balance"],
|
|
|
["佣金支付","cash"],
|
|
|
["积分支付","cent"],
|
|
|
@@ -160,7 +161,7 @@ class Order < ActiveRecord::Base
|
|
|
if !self.pay_way.blank? && !self.paied_price.blank?
|
|
|
#return 0
|
|
|
case self.pay_way
|
|
|
- when "weixinpay"
|
|
|
+ when "weixinpay", "allinpay"
|
|
|
paied_price_f = self.paied_price!=0 ? ((self.paied_price)/100.0) :0
|
|
|
return paied_price_f.to_s # + "元"
|
|
|
when "balance"
|
|
|
@@ -485,4 +486,3 @@ class Order < ActiveRecord::Base
|
|
|
|
|
|
end
|
|
|
|
|
|
-
|