blsm-vd-core 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 041e95363c78ae585254470f8bf9fdd8dd0ba3fc
-  data.tar.gz: 897df5623ae1f6456682bebc9206b92909ff036a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2IzMTgwMWI3YzdhOTRkMzIxMjMzOGJiYjU2MmQyNjc1OTlmODA0MA==
+  data.tar.gz: !binary |-
+    NTYxNmEyM2Y0ZDVjY2JhM2EwODgwMWE2NzM0NTEwMTY5ZmU1OGE2MQ==
 SHA512:
-  metadata.gz: d4effb707d126926030aef277addc2ab11abe3867c48ad081c1b34e16d5243d19f07c1b8e793b4a87b99fb2a2430ea27419f5e9b7246aca440aae0304e9917c4
-  data.tar.gz: a4bebf8e64c41082cadaea0f4fa96fb67d72fc7771ba13ef62e5816e00f0567866d402e776ab072eff89d9888e1f1f0e2d335dd570d0d22f6749aed4ca29637a
+  metadata.gz: !binary |-
+    ZGYxNjRiODRiZjQwMjg0MzFjMWVhNDI4N2UzOThlYzEzNmExNDYwYTNlNTM5
+    MjEyMDg4NTBkNTEyMjc2ZjQ2N2FjY2EyMDQzZjQwZWUxMjQwMjY3ZDg4MGI3
+    ZDI3MDNhMjNjZGI3M2IwNjBhN2YzZjFhNmJiMmMwZjUzOWU0ZjU=
+  data.tar.gz: !binary |-
+    NGM4ZDUzYzE5NWZlM2I0YTczODRlMDZjNDEwZjU4NjIxYmIwNzdiOTYwMDBh
+    ZmY0MjA1N2YzNTEzOTU4OWQwMWU3MzVkZmIwMDc4YzdjYzA5NWYxYzBjYjNk
+    ODdkNDRmZjI3YjY2MTg1MGIyODFlNGI1OTljMGY2MDJmYzI3ZmE=

data/Gemfile.lock

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

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

@@ -6,6 +6,11 @@ module BlsmVdCore
     belongs_to :user, class_name: '::BlsmVdCore::User'
     belongs_to :supervisor, class_name: '::BlsmVdCore::User'
 
+    #變化積分
+    def change_score(changed_score)
+      self.update_attributes({score: self.score+changed_score})
+    end
+
     #是否是黑带
     def is_black?
       self.vd_role == 'black'

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/blsm-vd-core.rb

@@ -65,12 +65,9 @@ module BlsmVdCore
       return on_order_sale_out(order.application.user_id, order_id) if order.application
     end
 
-    #订单被取消=>删除结算项
+    #订单被取消=>删除结算项(扣除積分)
     if order.state.to_s.include?('订单取消')
-      order.clearing_items.each { |item|
-        item.destroy unless item.state == 'CASH_BACK'
-      } if order.clearing_items
-      return ERROR_CODES[200]
+      return on_order_canceled(order.application.user_id, order_id) if order.application
     end
 
     #在线支付（客户签收，订单完成）=>确认结算项
@@ -255,4 +252,74 @@ module BlsmVdCore
 
   end
 
+
+  #【積分消耗】商品售卖出去
+  # 什么时候调用此方法合适？当订单的状态变更为‘已取消’时
+  #微店主的积分会根据商品总的供货价的
+  #订单取消，微店主会被扣直接的 订单供货价 * +SCORES[:SALE_OUT_DIRECT]+ 积分
+  #        微店主所属的队长（直接上级）被扣 订单供货价 * +SCORES[:SALE_OUT_INDIRECT]+ 积分
+  #==== Parameters
+  # * +seller_id+  - 销售员的id
+  # * +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
+    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)
+
+
+    return ERROR_CODES[0] unless order.clearing_items
+
+    #删除结算项
+    order.clearing_items.each { |item|
+      item.destroy unless item.state == 'CASH_BACK'
+    }
+
+    #安全校验(是否曾经被售出过)
+    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_cancel"
+    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
+    seller_change = -franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]
+    leader_change = -franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+
+    #扣取积分
+    seller_info.change_score(seller_change)
+    leader_info.change_score(leader_change) if leader_info
+
+    #积分变动通知
+    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
+    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}取消，积分扣取"
+                       })
+    VdUserScore.create({
+                           user_id: leader.id,
+                           score: leader_change,
+                           notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取"
+                       }) if leader_info
+
+    #安全库录入信息
+    VdInfoSec.committed(vd_transaction)
+
+    ERROR_CODES[200]
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - saxer
@@ -14,140 +14,140 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: blsm-mp-wx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
@@ -157,8 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -191,12 +191,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []