blsm-vd-core 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb28c1e3bcac159da02aace1ec8c3f7e049f0e9
-  data.tar.gz: 5417d8327a29ed669eac889ded8f547912c869be
+  metadata.gz: 5322b9f1fc63cec5898deb12eb89c730baae3e7b
+  data.tar.gz: a3790355fc522ab8399c526211166e8177fcf158
 SHA512:
-  metadata.gz: c4c1f9f58de60de08e2de127ab1163832e0a36c8bd849440f01da09db8fa597a32e837e6813f044b033cc55e71ce1d510e234c8ce64597ebe17555877a310f83
-  data.tar.gz: 46c4130a0a65e08429dd4afce0f09f04f3043f8432c8eefca5f695703625fc4ae5d5e18b700a2cd1741a935b3174b30f0a0eed50f657e2ccb48725b8e0f447b5
+  metadata.gz: 0739e5eab287cd906bb470e96a304cbede812ba9b908caf0080d285187ed51c96ac28ae74ccfdd93cae9e048743e326099bdaf585ac0fc228c857f84f0c46616
+  data.tar.gz: 01b09720467e9fa8465c64373897718946b290caa87be9160b9bd5edf01bf4a81faedec109df489888dbe4b26675de719836b12f8483613a5a23d4ddbc9a34ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.5.1)
+    blsm-vd-core (0.5.4)
 
 GEM
   remote: https://ruby.taobao.org/

data/lib/blsm-vd-core/version.rb

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.5.4"
-end
+  VERSION = "0.5.5"
+end

data/lib/blsm-vd-core.rb

@@ -266,8 +266,8 @@ module BlsmVdCore
       leader_change = order.get_vd_score(leader_info.vd_role)
       # - 卖家是黑带，但是从属于某个黑带名下
       if seller_info.is_black?
-        seller_change = 0
-        leader_change = (order.get_vd_score(seller_info.vd_role))
+        seller_change = (order.get_vd_score(seller_info.vd_role))*0.7
+        leader_change = (order.get_vd_score(seller_info.vd_role))*0.3
         # - 卖家所属的黑带，是某个黑带的附属黑带
       elsif leader_info.supervisor_slave && leader_info.supervisor
         org_leader = leader_info.supervisor
@@ -275,13 +275,14 @@ module BlsmVdCore
         leader_change = order.get_vd_score(leader_info.vd_role)*0.7
         org_leader_change = order.get_vd_score(org_leader_info.vd_role)*0.3
       end
-    else #卖家没有领导（黑带或者是独立店主）
-      seller_change = 0 if seller_info.is_black?
+      #卖家是黑带
+    else
+      seller_change = order.get_vd_score(seller_info.vd_role) if seller_info.is_black?
     end
 
     # 卖家信息变动
     # if seller_change!=0
-    # seller_info.update_attributes({:score => seller_info.score.to_f+seller_change})
+    seller_info.update_attributes({:score => seller_info.score.to_f+seller_change}) if seller_change!=0
     seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "您好，订单#{order.number}已成功签收，分销#{franchise_sum}元"}
     BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
     VdUserScore.create({

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec