blsm-vd-core 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d234ba7e348a81c7e4f336d483f94c2e31c440
-  data.tar.gz: 4b8aab14b2c2326c108d79e2ff2f7f5f95f38603
+  metadata.gz: 5cfbe74a9b2aae00ab57d96ad09e061fbd97b5b7
+  data.tar.gz: f12f5e6d61cbb865c8770740870e2d61af15c47d
 SHA512:
-  metadata.gz: fdb277c73ca1603237fa815e838946d04459c9b351fee9848807b111a488eadbee446028f48180b7956f06ee7759e18bf4926caad579bde44bd4f27a6dc2140e
-  data.tar.gz: b6ab4c4c29fb6d84ee72f42d8295e8ccc9e644a899d4db7a0732eb89b004fa7889bee81189a47e3addf317a297d013e503229b6cc2015b71334484527774dfac
+  metadata.gz: a38942e555d4a3570a076a70b75fa20c7153285d3c0587c3d2f15b231aa3574c0a4dc6bd97da69c30f614040d5bd778f989bda3c9395037e9e34d90c1dd27a05
+  data.tar.gz: f98d6419af754ff7c6a4ea759d511955b1e826724e929951965b6695f8f9a120abb041eec43baa6c2464c7be1cca83934a9d30b93faba6f46bd710beea337860

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.7.5)
+    blsm-vd-core (0.7.7)
 
 GEM
   remote: https://ruby.taobao.org/
@@ -127,4 +127,4 @@ DEPENDENCIES
   rspec (~> 3.2)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/blsm-vd-core.rb

@@ -80,9 +80,49 @@ module BlsmVdCore
       clearing_item = ClearingItem.where(order_id: order.id).first if order.ubox_order?
       if order.application
         on_order_sale_out(order.application.user_id, order_id)
-        #订单完成, 发送融云消息
-        if order.application.user
-          VdRcMsgNotify.create_order_finish_notify(order.application.user.username)
+        #订单完成, 发送融云消息, 给邀请人奖励
+        user =  order.application.user
+        if !user.blank?
+          #订单完成, 发送融云消息
+          if !user.rc_user.blank?
+            VdRcMsgNotify.create_order_finish_notify(user.username)
+          end
+          # 给邀请人
+          inviter = User.where(:invication_code=>user.invicated_from).first
+          vd_transaction = "inviter_#{order.id}_reward"
+          if user.create_vd_user_info.channel == "market_invite" && !inviter.blank? && !BlsmVdCore::VdInfoSec.dangerous?(vd_transaction)
+            #为邀请人创建,结算项
+            ClearingItem.create({
+                                    state: 'CASH_BACK',
+                                    pay_type: "ZXZF",
+                                    user_id: inviter.id,
+                                    order_id: -11,
+                                    rate_of_profit: 1,
+                                    earn_amount: (order.total_fee.to_f * 0.1).round(2)
+                                })
+            #发送给邀请人微信提醒
+            content = "您邀请的店主 #{user.username}（注册电话号为#{user.phone}）与#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}成功成交一笔订单，订单金额为#{order.total_fee.to_f}元， 您将同步获取邀请奖励#{(order.total_fee.to_f * 0.1).round(2)}元，特此通知"
+            VdMpMsg.create!({
+                                app_id: BlsmMpWx.APP_ID,
+                                openid: inviter.openid,
+                                content: content,
+                                msg_name: "custom",
+                                template_msg: false,
+                                status: 'none'
+                            })
+            #发送给邀请人融云提醒
+            if !inviter.rc_user.blank?
+              VdRcMsgNotify.create({
+                                       user_id: 3,
+                                       to_ids: inviter.username,
+                                       title: "提醒",
+                                       to_type: 'single',
+                                       msg_type: 'RC:TxtMsg',
+                                       content: content
+                                   })
+            end
+            BlsmVdCore::VdInfoSec.committed(vd_transaction)   #防止重复创建
+          end
         end
       end
       clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'}) if clearing_item && order.pay_on_line?

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.7.6"
-end
+  VERSION = "0.7.7"
+end

metadata

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