blsm-vd-core 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3351fcf2494294fe3334b2bc768c1a50330a0bfc
-  data.tar.gz: 05a20aefb14792cf73e806c2fc71c250666a5fef
+  metadata.gz: b57b906e7e5353bf1462b2ef2837017a0646b34f
+  data.tar.gz: b615efb55cc6ef16946ad27a18e29993019504fc
 SHA512:
-  metadata.gz: 49187cb2fa60b3212ab552721b2dfab120b2cb2d5f9f294fd284bb866c8f9a5d2ef5860e8963cb3b39e55bbfd972db437fc45be3e0a4b3ce52c3151acc061288
-  data.tar.gz: cbaeeb699ddfb8786fea135e5c35a3187dab930f35fce02f83815a93f2f7b54106427afb49527618abbbb50fd2dea78f12d81f450b9a0f305b549399db900f2e
+  metadata.gz: c1110f0ac05fe5a53d7c00d860583d282f7ab046cb04d374b2ef21f631cafc1e326e8ac2b13633eccbe55ee4d99ae60a1c536d6f2776b0da94a678552bf80272
+  data.tar.gz: 8cbb151b80a35bda57af73e6891d1269ecc1a691714d8afbf601690df7a5f006d8318004a896227c98d3a2eac3437b7355c75d0aba1c921b9ae380d90f079e14

data/Gemfile.lock

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

data/blsm-vd-core.gemspec

@@ -6,9 +6,9 @@ require 'blsm-vd-core/version'
 Gem::Specification.new do |spec|
   spec.name = "blsm-vd-core"
   spec.version = BlsmVdCore::VERSION
-  spec.authors = ["saxer"]
+  spec.authors = ["saxer","sunyafei"]
   spec.licenses = ['MIT']
-  spec.email = ["15201280641@qq.com"]
+  spec.email = ["15201280641@qq.com","1752709589@qq.com"]
 
   spec.summary = %q{首趣微店核心模块}
   spec.description = %q{首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息}

data/lib/blsm-vd-core/model/order.rb

@@ -9,6 +9,18 @@ module BlsmVdCore
     encrypted_id key: 'bYqILlFMZn3xd8Cy'
 
     public
+    def get_vd_score(role)
+      column = "black" == role ? "black_belt_rate" : "ordinary_rate"
+      fee = 0.0
+      self.line_items.each do |item|
+        next if item.product_prop.nil?
+        rate = item.product_prop.send(column)
+        rate = VdUserScore::SCORES[:SALE_OUT_DIRECT] if rate.nil? && "normal" == role
+        rate = VdUserScore::SCORES[:SALE_OUT_INDIRECT] if rate.nil? && "black" == role
+        fee += ((item.quantity * item.franchise_price.to_f) * rate)
+      end
+      fee
+    end    
     def pay_off_line?
       self.pay_type == 1
     end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/blsm-vd-core.rb

@@ -109,6 +109,9 @@ module BlsmVdCore
     #签收失败（拒签）
     if sign_type =~ /sign_fail/
       VdInfoSec.committed(vd_transaction)
+      user = order.application.user if order && order.application
+      #拒签删除积分
+      on_order_sign_fail(user.id,order_id) if user
       if clearing_item.clearing && clearing_item.clearing.state == "BALANCED"
         i_clearing = clearing_item.clone
         i_clearing.clearing_id = nil
@@ -235,8 +238,8 @@ module BlsmVdCore
     franchise_sum = order.franchise_sum
 
     #积分获取
-    seller_change = franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]
-    leader_change = franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+    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
 
@@ -250,12 +253,14 @@ module BlsmVdCore
     VdUserScore.create({
                            user_id: seller_id,
                            score: seller_change,
-                           notes: "分销#{franchise_sum}元,订单#{order_id}完成"
+                           notes: "分销#{franchise_sum}元,订单#{order_id}完成",
+                           score_type: vd_transaction
                        })
     VdUserScore.create({
                            user_id: leader.id,
                            score: leader_change,
-                           notes: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{order_id}完成"
+                           notes: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{order_id}完成",
+                           score_type: vd_transaction
                        }) if leader_info
 
     #店主销售额、分销额增加
@@ -308,16 +313,17 @@ module BlsmVdCore
 
     #供货价总和、应该扣取的积分总额
     franchise_sum = order.franchise_sum
-    seller_change = -franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]
-    leader_change = -franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: sold_out) if leader && leader_info
+    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: sold_out).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_info
+    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 && leader_info
+    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
 
@@ -325,13 +331,15 @@ module BlsmVdCore
     VdUserScore.create({
                            user_id: seller_id,
                            score: seller_change,
-                           notes: "订单#{order_id}取消，积分扣取"
+                           notes: "订单#{order_id}取消，积分扣取",
+                           score_type: vd_transaction
                        })
     VdUserScore.create({
                            user_id: leader.id,
                            score: leader_change,
-                           notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取"
-                       }) if leader_info
+                           notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取",
+                           score_type: vd_transaction
+                       }) if leader_order_score
 
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
@@ -339,4 +347,66 @@ module BlsmVdCore
     ERROR_CODES[200]
 
   end
+
+  # 什么时候调用此方法合适？当订单的状态变更为‘拒签’时
+  #==== Parameters
+  # * +seller_id+  - 销售员的id
+  # * +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
+    order = Order.where(id: order_id).first
+
+    return ERROR_CODES[4045] unless seller
+    return ERROR_CODES[401] if !order || !order.application || !(order.application.user_id==seller_id)
+
+    #安全校验(是否曾经被售出过)
+    sold_out = VdInfoSec.dangerous?("order_sale_out_#{seller_id}_#{order_id}")
+    return ERROR_CODES[200] unless sold_out
+
+    #安全校验(是否曾经此订单被取消，并且扣取积分)
+    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
+
+    #供货价总和、应该扣取的积分总额
+    franchise_sum = order.franchise_sum
+    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: sold_out) if leader && leader_info
+    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: sold_out).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)
+
+    ERROR_CODES[200]
+
+  end
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - saxer
+- sunyafei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -153,6 +154,7 @@ dependencies:
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com
+- 1752709589@qq.com
 executables: []
 extensions: []
 extra_rdoc_files: []