blsm-vd-core 0.7.3 → 0.7.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d900f262f49e3f750e6e1282ba46eae80e3a2e8c
4
- data.tar.gz: 457b226937b09497e4700586b591f779ebaf8adf
3
+ metadata.gz: ddc25d5bc15d686ab2a58a6ff6282e775079b4f4
4
+ data.tar.gz: cf22d35da1070654dac313e72b2724fce6d7fd4e
5
5
  SHA512:
6
- metadata.gz: a8eeca634abbb9c5745888b419ce0fa1f0a1c32914626c46e31e49ebf7dae37f0a54662911e81b23ca3d333afdec03aa9ad197bfcb32bfc3ae441b861f8097d4
7
- data.tar.gz: eb42d8cf00896b68a771f955c450773513dccf549f66cef609d2e0a0123df8384c7c67d98cd6e68fca13d3b3e7078c238750324ec657d3afa96008b2d7e4a956
6
+ metadata.gz: 78b7d20c1952dcaae111caf96d7758bb5a9523a851436b10c3645e91e34a0e0f2c221cda95feb169f8f7204aed33fa13587d31836a43c2af488b7add9663667e
7
+ data.tar.gz: 38dbc54bf3e91639688797f892e6aea856b6e54c9ed7816117dbf912a701e7157f6ce00e2b1003be4dc8fa1d49cd3dc6a01c4ebf9d9daa26b92eac11662cc425
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- blsm-vd-core (0.7.3)
4
+ blsm-vd-core (0.7.4)
5
5
 
6
6
  GEM
7
7
  remote: https://ruby.taobao.org/
@@ -4,9 +4,10 @@ module BlsmVdCore
4
4
  self.table_name='ubox_vms'
5
5
  belongs_to :application, class_name: "::BlsmVdCore::Application"
6
6
 
7
- #settlement 结算方式 0:默认(售价25%), 1:加盟商(售价100%)
7
+ #settlement 结算方式 0:默认(售价25%), 1:加盟商(售价100%),其他:百分比
8
8
  def settlement_rate
9
9
  return 1.0 if self.settlement==1
10
+ return self.settlement.to_f if self.settlement.to_f<1 && self.settlement.to_f>0
10
11
  0.25
11
12
  end
12
13
  end
@@ -1,3 +1,3 @@
1
1
  module BlsmVdCore
2
- VERSION = "0.7.3"
2
+ VERSION = "0.7.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: blsm-vd-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.3
4
+ version: 0.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - saxer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: exe
11
11
  cert_chain: []
12
- date: 2016-10-24 00:00:00.000000000 Z
12
+ date: 2016-11-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec