blsm-vd-core 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13344336d0479a112cfaa02f8805d282a88905c2
-  data.tar.gz: 17c2fb659700b6a1071b106f6071af4a91fadf83
+  metadata.gz: c2e4c393f9c216eaed675b271630dc4e3c510083
+  data.tar.gz: 102b4dbcb46114b6752f3f27bf2e5d201e049fb9
 SHA512:
-  metadata.gz: 3b4b5be8c3f3d4101cac229bd5c1fd531df9344082cb39b8de80da990244d238ca9947ea53f5e9ea77aa2bee5d257294ac50c4d5fc837499ca6f8dcf4b033b7a
-  data.tar.gz: 8126fd350b189ef278b1662a7c62a401791252f439fdd5bab18ae883a3d3bfaaa187b625f83a54b867bdcdc7f3782d41184c382b8f8de51fc1c36e3ff64cca17
+  metadata.gz: df32d33db6fdae4dd501e0581285349da4b53f6c63b04e01d7a8acf24f5214c4fc690ed34f9333c242d2107307782142ab5a7b30ff5450a2406bb95da3ef8281
+  data.tar.gz: e0f73430145cc0ed6854552a3ed1276bc14393d5f73968775b8d7084433e5212d1f2f6425e914e8b574db9db40a166ae49df95b2b986aaedf2c32626b8332f19

data/Gemfile.lock

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

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.4.6"
+  VERSION = "0.4.8"
 end

data/lib/blsm-vd-core.rb

@@ -260,30 +260,60 @@ module BlsmVdCore
 
     #积分获取
     seller_change = order.get_vd_score(seller_info.vd_role)
-    leader_change = order.get_vd_score(leader_info.vd_role) if leader_info
-    seller_info.update_attributes({:score => seller_info.score.to_f+seller_change})
-    leader_info.update_attributes({:score => leader_info.score.to_f+leader_change}) if leader_info
-
-    #积分变动通知
-    seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "您好，订单#{order.number}已成功签收，分销#{franchise_sum}元"}
-    leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "首趣黑带#{leader.username}，你好，你的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元"} if leader && leader_info
-    BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
-    BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
-
-    #积分历史
-    VdUserScore.create({
-                           user_id: seller_id,
-                           score: seller_change,
-                           notes: "订单#{order.number}已成功签收，分销#{franchise_sum}元",
-                           score_type: vd_transaction
-                       })
-    VdUserScore.create({
-                           user_id: leader.id,
-                           score: leader_change,
-                           notes: "队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元",
-                           score_type: vd_transaction
-                       }) if leader_info
+    if leader_info
+      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)+order.get_vd_score(leader_info.vd_role))
+        # - 卖家所属的黑带，是某个黑带的附属黑带
+      elsif leader_info.supervisor_slave && leader_info.supervisor
+        org_leader = leader_info.supervisor
+        org_leader_info = org_leader.create_vd_user_info
+        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
+    end
+
+    # 卖家信息变动
+    if seller_change!=0
+      seller_info.update_attributes({:score => seller_info.score.to_f+seller_change})
+      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({
+                             user_id: seller_id,
+                             score: seller_change,
+                             notes: "订单#{order.number}已成功签收，分销#{franchise_sum}元",
+                             score_type: vd_transaction
+                         })
+    end
+
+    #黑带信息变动
+    if leader && leader_info && leader_change && leader_change!=0
+      leader_info.update_attributes({:score => leader_info.score.to_f+leader_change})
+      leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "首趣黑带#{leader.username}，你好，你的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元"}
+      BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change')
+      VdUserScore.create({
+                             user_id: leader.id,
+                             score: leader_change,
+                             notes: "队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元",
+                             score_type: vd_transaction
+                         })
+    end
 
+    #原始黑带信息变动
+    if org_leader && org_leader_info && org_leader_change && org_leader_change!=0
+      org_leader_info.update_attributes({:score => org_leader_info.score.to_f+org_leader_change})
+      org_leader_notify = {touser: org_leader.openid, change: org_leader_change, total: org_leader_info.score,
+                           content: "首趣黑带#{org_leader.username}，你好，你的附属黑带【#{leader.username}】的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元"}
+      BlsmMpWx.create_msg(nil, org_leader.openid, org_leader_notify, 'score_change')
+      VdUserScore.create({
+                             user_id: org_leader.id,
+                             score: org_leader_change,
+                             notes: "下属黑带【#{leader.username}】的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元",
+                             score_type: vd_transaction
+                         })
+    end
     #店主销售额、分销额增加
     seller_info.update_attributes({:sale_sum => seller_info.sale_sum.to_f + order.total_fee.to_f})
     seller_info.update_attributes({:distribute_sum => seller_info.distribute_sum.to_f + order.franchise_sum.to_f})
@@ -306,7 +336,7 @@ module BlsmVdCore
   # * +order_id+  - 订单id
   def on_order_canceled(seller_id, order_id)
     seller = User.where(id: seller_id).first
-    leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
+    # leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
     order = Order.where(id: order_id).first
 
     return ERROR_CODES[4045] unless seller
@@ -327,41 +357,55 @@ module BlsmVdCore
 
     #安全校验(是否曾经此订单被取消，并且扣取积分)
     vd_transaction = "order_sale_out_#{seller_id}_#{order_id}_then_cancel"
-    return ERROR_CODES[200] if VdInfoSec.dangerous?(vd_transaction)
+    danger = VdInfoSec.dangerous?(vd_transaction)
+    return danger if danger
 
     #卖家和团队领导的信息
-    seller_info = seller.create_vd_user_info
-    leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
+    # seller_info = seller.create_vd_user_info
+    # leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
+
+    VdUserScore.where(score_type: score_type_str).each do |score|
+      score_change = -score.score
+      if score.user
+        score.user.create_vd_user_info.change_score(score_change)
+        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "订单#{order_id}取消"}
+        BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
+        VdUserScore.create({
+                               user_id: score.user_id,
+                               score: score_change,
+                               notes: "订单#{order.number}取消，积分扣取",
+                               score_type: vd_transaction
+                           })
+      end
+    end
 
-    #供货价总和、应该扣取的积分总额
-    franchise_sum = order.franchise_sum
-    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
-    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
-    leader_change = -leader_order_score.score if leader_order_score
-
-    #扣取积分
-    seller_info.change_score(seller_change)
-    leader_info.change_score(leader_change) if leader_change
-
-    #积分变动通知
-    seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}取消"}
-    leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}取消，积分扣取"} if leader_order_score
-    BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
-    BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
-
-    #积分历史
-    VdUserScore.create({
-                           user_id: seller_id,
-                           score: seller_change,
-                           notes: "订单#{order_id}取消，积分扣取",
-                           score_type: vd_transaction
-                       })
-    VdUserScore.create({
-                           user_id: leader.id,
-                           score: leader_change,
-                           notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取",
-                           score_type: vd_transaction
-                       }) if leader_order_score
+    # leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
+    # seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
+    # leader_change = -leader_order_score.score if leader_order_score
+    #
+    # #扣取积分
+    # seller_info.change_score(seller_change)
+    # leader_info.change_score(leader_change) if leader_change
+    #
+    # #积分变动通知
+    # seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}取消"}
+    # leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}取消，积分扣取"} if leader_order_score
+    # BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
+    # BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
+    #
+    # #积分历史
+    # VdUserScore.create({
+    #                        user_id: seller_id,
+    #                        score: seller_change,
+    #                        notes: "订单#{order_id}取消，积分扣取",
+    #                        score_type: vd_transaction
+    #                    })
+    # VdUserScore.create({
+    #                        user_id: leader.id,
+    #                        score: leader_change,
+    #                        notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取",
+    #                        score_type: vd_transaction
+    #                    }) if leader_order_score
 
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
@@ -376,7 +420,7 @@ module BlsmVdCore
   # * +order_id+  - 订单id
   def on_order_sign_fail(seller_id, order_id)
     seller = User.where(id: seller_id).first
-    leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
+    # leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
     order = Order.where(id: order_id).first
 
     return ERROR_CODES[4045] unless seller
@@ -391,39 +435,54 @@ module BlsmVdCore
     vd_transaction = "order_sale_out_#{seller_id}_#{order_id}_then_sign_fail"
     return ERROR_CODES[200] if VdInfoSec.dangerous?(vd_transaction)
 
-    #卖家和团队领导的信息
-    seller_info = seller.create_vd_user_info
-    leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
+    VdUserScore.where(score_type: score_type_str).each do |score|
+      score_change = -score.score
+      if score.user
+        score.user.create_vd_user_info.change_score(score_change)
+        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "订单#{order_id}拒签"}
+        BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
+        VdUserScore.create({
+                               user_id: score.user_id,
+                               score: score_change,
+                               notes: "订单#{order.number}拒签，积分扣取",
+                               score_type: vd_transaction
+                           })
+      end
+    end
 
-    #供货价总和、应该扣取的积分总额
-    franchise_sum = order.franchise_sum
-    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
-    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
-    leader_change = -leader_order_score.score if leader_order_score
-
-    #扣取积分
-    seller_info.change_score(seller_change)
-    leader_info.change_score(leader_change) if leader_change
-
-    #积分变动通知
-    seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}拒签"}
-    leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取"} if leader_order_score
-    BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
-    BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
-
-    #积分历史
-    VdUserScore.create({
-                           user_id: seller_id,
-                           score: seller_change,
-                           notes: "订单#{order_id}拒签，积分扣取",
-                           score_type: vd_transaction
-                       })
-    VdUserScore.create({
-                           user_id: leader.id,
-                           score: leader_change,
-                           notes: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取",
-                           score_type: vd_transaction
-                       }) if leader_order_score
+    #卖家和团队领导的信息
+    # seller_info = seller.create_vd_user_info
+    # leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
+    #
+    # #供货价总和、应该扣取的积分总额
+    # franchise_sum = order.franchise_sum
+    # leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
+    # seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
+    # leader_change = -leader_order_score.score if leader_order_score
+    #
+    # #扣取积分
+    # seller_info.change_score(seller_change)
+    # leader_info.change_score(leader_change) if leader_change
+    #
+    # #积分变动通知
+    # seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}拒签"}
+    # leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取"} if leader_order_score
+    # BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
+    # BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
+    #
+    # #积分历史
+    # VdUserScore.create({
+    #                        user_id: seller_id,
+    #                        score: seller_change,
+    #                        notes: "订单#{order_id}拒签，积分扣取",
+    #                        score_type: vd_transaction
+    #                    })
+    # VdUserScore.create({
+    #                        user_id: leader.id,
+    #                        score: leader_change,
+    #                        notes: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取",
+    #                        score_type: vd_transaction
+    #                    }) if leader_order_score
 
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec