blsm-vd-core 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96a09005b55e480864d0ccd8d14b34ee09fabe7d
-  data.tar.gz: 58369f32ba270c58accab9ffcf77e0577eb6328f
+  metadata.gz: 12af7f64e7c2ec0eb2faa8c5ed65a266fb822cb7
+  data.tar.gz: 85c1bfc5988d6749a7384cde62d90907dd7babc4
 SHA512:
-  metadata.gz: 79a11de11b20e13fc1e6db9aab3cd49d8b7a00d165f69acd6497405647985f18431064a4842104684aae546dfe9bbd1cd06fec9ef42cd3f404cb20b29a5b6330
-  data.tar.gz: bcb618402d988a7bf116b798844877b03f0b059001538824f36f353f5f2f4607d7e84e1168b0702b29f820a4a161a3f00ea6e1f22bb7806dbce32e85d9e873c8
+  metadata.gz: 504339041e2349bd75cc635d84f8c5d72b78df7a51db869ee062c6e5feec7d7aae2f21e473e454c8e015300aab7fc94e5e35936f08445b45bfdec18a71f6e179
+  data.tar.gz: efc894e2330a92eebbeb667d9e865b58b23d620d7fb15177142fc84627fb2cce922848b5b445d46b809e813378604b7293bbed5dfb610bf3df3425c1d7e369e3

data/Gemfile.lock

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

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/lib/blsm-vd-core.rb

@@ -96,84 +96,7 @@ module BlsmVdCore
     if order.state.to_s.include?('客户签收，订单完成')
       create_clearing_item(order_id) if order.ubox_order?
       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)
-        #订单完成, 发送融云消息, 给邀请人奖励
-        user = order.application.user
-        if !user.blank?
-          #订单完成, 发送融云消息
-          if !user.rc_user.blank?
-            VdRcMsgNotify.create_order_finish_notify(user.username)
-          end
-          # 包邮券返款
-          if order.vd_free_post
-            ClearingItem.create({
-                                    state: 'CASH_BACK',
-                                    pay_type: "ZXZF",
-                                    user_id: user.id,
-                                    order_id: -14,
-                                    rate_of_profit: 1,
-                                    earn_amount: order.shipping_charge
-                                })
-          end
-
-          # 进货费返还
-          user_info = user.create_vd_user_info
-          if !order.line_items.blank? && user_info.purchase_fee > 0
-            franchise_price = order.line_items.inject(0) { |result, item| result+item.franchise_price*item.quantity }
-            earn_amount = franchise_price < user_info.purchase_fee ? franchise_price : user_info.purchase_fee
-            #创建结算项
-            ClearingItem.create({
-                                    state: 'CASH_BACK',
-                                    pay_type: "ZXZF",
-                                    user_id: user.id,
-                                    order_id: -13,
-                                    rate_of_profit: 1,
-                                    earn_amount: earn_amount
-                                })
-            user_info.update_attributes(:purchase_fee => (user_info.purchase_fee - earn_amount))
-          end
-          # 给邀请人奖励
-          inviter = User.where(:invication_code => user.invicated_from).first if user.invicated_from
-          vd_transaction = "inviter_#{order.id}_reward"
-          #被邀请人,金牌店主以下,渠道邀请,邀请人不为空,一个订单只能有一个结算项
-          if user.vd_user_info.distribute_sum < 1500 && user.create_vd_user_info.channel == "market_invite" && !inviter.blank? && !BlsmVdCore::VdInfoSec.dangerous?(vd_transaction)
-
-            #发送给邀请人微信提醒
-            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)}元，特此通知"
-
-            #为邀请人创建,结算项
-            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)
-                                })
-            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
+      on_order_sale_out(order.application.user_id, order_id) if order.application
       clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'}) if clearing_item && order.pay_on_line?
       return ERROR_CODES[200]
     end
@@ -549,6 +472,79 @@ module BlsmVdCore
 
     end
 
+
+    #防拒签通知
+    if seller.rc_user
+      VdRcMsgNotify.create_order_finish_notify(seller.username)
+    end
+
+    # 包邮券返款
+    if order.vd_free_post
+      ClearingItem.create({
+                              state: 'CASH_BACK',
+                              pay_type: "ZXZF",
+                              user_id: seller.id,
+                              order_id: -14,
+                              rate_of_profit: 1,
+                              earn_amount: order.shipping_charge
+                          })
+    end
+
+    #供货全返还
+    if order.line_items && seller_info.purchase_fee > 0
+      franchise_price = order.line_items.inject(0) { |result, item| result+item.franchise_price*item.quantity }
+      earn_amount = franchise_price < seller_info.purchase_fee ? franchise_price : seller_info.purchase_fee
+      #创建结算项
+      ClearingItem.create({
+                              state: 'CASH_BACK',
+                              pay_type: "ZXZF",
+                              user_id: seller.id,
+                              order_id: -13,
+                              rate_of_profit: 1,
+                              earn_amount: earn_amount
+                          })
+      seller_info.update_attributes(:purchase_fee => (seller_info.purchase_fee - earn_amount))
+    end
+
+    # 给邀请人奖励
+    inviter = User.where(:invication_code => seller.invicated_from).first if seller.invicated_from
+    #被邀请人,金牌店主以下,渠道邀请,邀请人不为空,一个订单只能有一个结算项
+    if inviter && seller_info.distribute_sum < 1500 && seller_info.channel == "market_invite"
+
+      #发送给邀请人微信提醒
+      content = "您邀请的店主 #{seller.username}（注册电话号为#{seller.phone}）与#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}成功成交一笔订单，订单金额为#{order.total_fee.to_f}元， 您将同步获取邀请奖励#{(order.total_fee.to_f * 0.1).round(2)}元，特此通知"
+
+      #为邀请人创建,结算项
+      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)
+                          })
+      VdMpMsg.create!({
+                          app_id: BlsmMpWx.APP_ID,
+                          openid: inviter.openid,
+                          content: content,
+                          msg_name: "custom",
+                          template_msg: false,
+                          status: 'none'
+                      })
+      #发送给邀请人融云提醒
+      if inviter.rc_user
+        VdRcMsgNotify.create({
+                                 user_id: 3,
+                                 to_ids: inviter.username,
+                                 title: "提醒",
+                                 to_type: 'single',
+                                 msg_type: 'RC:TxtMsg',
+                                 content: content
+                             })
+      end
+    end
+
+
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec