blsm-vd-core 0.5.4 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: efb28c1e3bcac159da02aace1ec8c3f7e049f0e9
4
- data.tar.gz: 5417d8327a29ed669eac889ded8f547912c869be
3
+ metadata.gz: 5322b9f1fc63cec5898deb12eb89c730baae3e7b
4
+ data.tar.gz: a3790355fc522ab8399c526211166e8177fcf158
5
5
  SHA512:
6
- metadata.gz: c4c1f9f58de60de08e2de127ab1163832e0a36c8bd849440f01da09db8fa597a32e837e6813f044b033cc55e71ce1d510e234c8ce64597ebe17555877a310f83
7
- data.tar.gz: 46c4130a0a65e08429dd4afce0f09f04f3043f8432c8eefca5f695703625fc4ae5d5e18b700a2cd1741a935b3174b30f0a0eed50f657e2ccb48725b8e0f447b5
6
+ metadata.gz: 0739e5eab287cd906bb470e96a304cbede812ba9b908caf0080d285187ed51c96ac28ae74ccfdd93cae9e048743e326099bdaf585ac0fc228c857f84f0c46616
7
+ data.tar.gz: 01b09720467e9fa8465c64373897718946b290caa87be9160b9bd5edf01bf4a81faedec109df489888dbe4b26675de719836b12f8483613a5a23d4ddbc9a34ec
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- blsm-vd-core (0.5.1)
4
+ blsm-vd-core (0.5.4)
5
5
 
6
6
  GEM
7
7
  remote: https://ruby.taobao.org/
@@ -1,3 +1,3 @@
1
1
  module BlsmVdCore
2
- VERSION = "0.5.4"
3
- end
2
+ VERSION = "0.5.5"
3
+ end
data/lib/blsm-vd-core.rb CHANGED
@@ -266,8 +266,8 @@ module BlsmVdCore
266
266
  leader_change = order.get_vd_score(leader_info.vd_role)
267
267
  # - 卖家是黑带,但是从属于某个黑带名下
268
268
  if seller_info.is_black?
269
- seller_change = 0
270
- leader_change = (order.get_vd_score(seller_info.vd_role))
269
+ seller_change = (order.get_vd_score(seller_info.vd_role))*0.7
270
+ leader_change = (order.get_vd_score(seller_info.vd_role))*0.3
271
271
  # - 卖家所属的黑带,是某个黑带的附属黑带
272
272
  elsif leader_info.supervisor_slave && leader_info.supervisor
273
273
  org_leader = leader_info.supervisor
@@ -275,13 +275,14 @@ module BlsmVdCore
275
275
  leader_change = order.get_vd_score(leader_info.vd_role)*0.7
276
276
  org_leader_change = order.get_vd_score(org_leader_info.vd_role)*0.3
277
277
  end
278
- else #卖家没有领导(黑带或者是独立店主)
279
- seller_change = 0 if seller_info.is_black?
278
+ #卖家是黑带
279
+ else
280
+ seller_change = order.get_vd_score(seller_info.vd_role) if seller_info.is_black?
280
281
  end
281
282
 
282
283
  # 卖家信息变动
283
284
  # if seller_change!=0
284
- # seller_info.update_attributes({:score => seller_info.score.to_f+seller_change})
285
+ seller_info.update_attributes({:score => seller_info.score.to_f+seller_change}) if seller_change!=0
285
286
  seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "您好,订单#{order.number}已成功签收,分销#{franchise_sum}元"}
286
287
  BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
287
288
  VdUserScore.create({
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.5.4
4
+ version: 0.5.5
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-04-06 00:00:00.000000000 Z
12
+ date: 2016-04-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec