blsm-vd-core 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDY0OGFiZTI1ZWQyNjE1OWU3MzhlMWFlYzc2N2Q4OGM4ZWEyNmNhMQ==
+    MWVhZTNmZTdmOWIyYzk1MjAzZmYwNmFmNTI1YTgxODM4NzYwNmE2Yw==
   data.tar.gz: !binary |-
-    NDhhODgzMzM4MjEzOTgyOWRlNDM3NWQyNzY0NzkxMTEyMDhhZmJjOQ==
+    NTMwMGM4NTY5ZTExNTFjNDExOGFlYWU1YTg0ZmIxNGZiMGVhMTEzOQ==
 SHA512:
   metadata.gz: !binary |-
-    NzU2ZTFlMjJjODRmZjAxOThjOTg1NGVhY2Y0MzdiYTZjNmFiNjBjMzJjYmI3
-    Mjg0YmRhNTg5YTcxZTdiMGNhNTU3MWY3NTM2Y2M2MWM2MzllZjJkNWNjZGQx
-    YWJiNjE0ZTllMzE5NmE0YmM4ZmRiMjE5MWY4NWZhNmZjOTEwNWE=
+    OTAwOTUxOWY5MjJlMDBiNmE1MzU3OTI2NmUwYjBhZjYxMWFkYWVhMzc3NDI0
+    YzEzYTAxMmFkMTBjODZkYmY5ZTU1NjZiZTdhMGM4NTMyZTQ2YWRiOWE2OWJl
+    MGJjMTcxNzQ1N2FjZjIyN2YxNTVmYjkzNGE0MWVhYjk3NGMxODE=
   data.tar.gz: !binary |-
-    NWVhOGQ4NjMyNjU4N2Q0MzczYTY3Y2QzMmI3ZmNlODU0MzllMjUyZDk1N2Y5
-    OTM0ODVjYjU3YjliMTUwYWRhYjNjMmMwNDljZTQwOTFmOWE2MjBkMGNkMWYx
-    NDQ0MDMzMzY3YThhNjc5MmE4ZGM5ZjA2ZDdlZThhMmYzZDMzNmU=
+    MjQ4NTkyNjk0MzlhZmEwZDY3M2ExOGEwODkzZWFhNzUzMzgzOTUyZThhNWJl
+    OTg0YTg1OGVhY2MxZGM5NzU1NWRlMDVjYWE1NGYxNmUwNGMxYzJmMjQxYjc1
+    MTg2ZDE1NTdkNzQxNTA3MGEzYmNmNjE3ZDQ5ODE4OGZhOGVjMzQ=

data/Gemfile.lock

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

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/blsm-vd-core.rb

@@ -162,7 +162,23 @@ module BlsmVdCore
           data[:state] = 'CASH_BACK'
           data[:real_amount] = order.total_fee
         end
+
         ClearingItem.new(data).save
+
+
+        leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{user.id})").first
+        leader_info = leader.create_vd_user_info if leader
+
+        #订单确认提醒（黑带）
+        leader_change = order.franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+        distribute_leader_notify = {touser: leader.openid,
+                                    order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s),
+                                    score_change: leader_change,
+                                    money_change: leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY],
+                                    content: "首趣黑带#{leader.username}，你好：成员【#{user.username}】确认订单成功。"
+        } if leader && leader_info
+        BlsmMpWx.create_msg(nil, leader.openid, distribute_leader_notify, 'distribute') if distribute_leader_notify
+
         return ERROR_CODES[200]
       end
     end
@@ -230,15 +246,6 @@ module BlsmVdCore
     BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
     BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
 
-    #订单确认提醒（黑带）
-    distribute_leader_notify = {touser: leader.openid,
-                                order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s),
-                                score_change: leader_change,
-                                money_change: leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY],
-                                content: "首趣黑带#{leader.username}，你好：成员【#{seller.username}】确认订单成功。"
-    } if leader && leader_info
-    BlsmMpWx.create_msg(nil, leader.openid, distribute_leader_notify, 'distribute') if distribute_leader_notify
-
     #积分历史
     VdUserScore.create({
                            user_id: seller_id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - saxer