blsm-vd-core 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQ4NjFjNzViNjdhNWMyYWQ4ZGM4NjE2ZTA2MDFjNjAyODMwYzVhZA==
+    ODExNTc3ODI0YWUwMTJiMmJlNTg1YjFiMDFlZWFhNGFkNTg0ZmE3Mw==
   data.tar.gz: !binary |-
-    NjQ3MDMzNGQ5OTMzNzQ1ZGM5OTAyNWM2MzExMWFhMzkwN2M3OGZkOQ==
+    ODAzYjY0YmE0ZDFjMDY5OWMxZmUzM2UzYTlkNjJlY2RiN2VmYTFhYw==
 SHA512:
   metadata.gz: !binary |-
-    ZDZkZjMyZjY5MmJlZGUwODZlOGFlN2JiNGNiMWNkNjk4NWM1MmQyYWE2OWM5
-    N2VmZjhlM2Y3YzZlYTBjMGFhODkwZDVjMDJlMmMzZTQxNzA0MDBmYjBiZWU2
-    NWE3NGU3OTUxMDllMTAyNGI4MDU2MmIwNTg2MjllNjlkNzE4NGM=
+    MWM4NTk1MDQ4YTgyM2Q3MTVkZWZhM2Y1NTRiODMzYjE0ZDYxM2RjNGZjMjk4
+    OWUwYzQxYzUzYThiZjAzYWYxZTZjOWI3OTRkMDE1YzljMmYwNjI5OWUyOWY3
+    ZDAyMjQ4Y2EyNDllNDNlNmM2YmNmN2Q4MjBkODVlNzZlY2NlMzg=
   data.tar.gz: !binary |-
-    MTlhNzE0ZTllZTYzY2QyZjM5NzgzMDE4MTFiM2M2MjIyODA0MWU3NmNjM2Rj
-    NmI0ZDJjYTIwMjk0YmQ4N2NlNTM3NWE0N2RjNmI1NzQwYjJhMTAzMTdhODUz
-    OWU5YTk1YmYxNDczNTI2MjkxN2Y0ZmE3MTU1YjQ4YTAzMDRkZTk=
+    YmU3MTIwNmM5ZDhmODdlZWMwYjZkMTJkMzM0MTNlYmYxMTBiMWNkOGUyZjA1
+    MmM1NjhiMzgxOTE2NGRjMDIzOWYyY2FjN2ZhZjdlZWFiYTA5ZWEzMmUzYzU4
+    OGNkNDRlNTRlYmVjY2UwOWMxM2RjMjMzNjM3MGQ4MjVlYmI4NjY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.2.1)
+    blsm-vd-core (0.2.3)
 
 GEM
   remote: https://ruby.taobao.org/
@@ -34,6 +34,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+    blsm-mp-wx (0.1.7)
     builder (3.0.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -108,6 +109,7 @@ DEPENDENCIES
   activemodel (~> 3.2)
   activerecord (~> 3.2)
   activesupport (~> 3.2)
+  blsm-mp-wx (~> 0.1.7)
   blsm-vd-core!
   bundler (~> 1.9)
   faraday (~> 0.9)
@@ -115,3 +117,6 @@ DEPENDENCIES
   rails (~> 3.2)
   rake (~> 10.0)
   rspec (~> 3.2)
+
+BUNDLED WITH
+   1.10.3

data/blsm-vd-core.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord", "~> 3.2"
   spec.add_development_dependency "activesupport", "~> 3.2"
   spec.add_development_dependency "faraday", "~> 0.9"
+  spec.add_development_dependency "blsm-mp-wx", "~> 0.1.7"
 end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.2.2"
-end
+  VERSION = "0.2.3"
+end

data/lib/blsm-vd-core.rb

@@ -18,6 +18,7 @@ require 'blsm-vd-core/model/vd_info_sec'
 require 'blsm-vd-core/model/user'
 require 'blsm-vd-core/model/application'
 require 'faraday'
+require 'blsm-mp-wx'
 
 module BlsmVdCore
 
@@ -219,18 +220,27 @@ module BlsmVdCore
     franchise_sum = order.franchise_sum
 
     #积分获取
-    seller_info.update_attributes({:score => seller_info.score.to_f+franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]})
-    leader_info.update_attributes({:score => leader_info.score.to_f+franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]}) if leader_info
+    seller_change = franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]
+    leader_change = franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+    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: "分销#{franchise_sum}元,订单#{order_id}完成"}
+    leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{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: franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT],
+                           score: seller_change,
                            notes: "分销#{franchise_sum}元,订单#{order_id}完成"
                        })
     VdUserScore.create({
                            user_id: leader.id,
-                           score: franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT],
+                           score: leader_change,
                            notes: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{order_id}完成"
                        }) if leader_info
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - saxer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,6 +136,20 @@ dependencies:
     - - ~>
       - !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.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.7
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com