blsm-vd-core 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8483c659e2aa1e69e0841c2d46b53329a2a40054
-  data.tar.gz: 5d81f228f47615695f647208f93cd0475e1b838b
+  metadata.gz: 506ed800cbf0a0ad0ebbf04eb1866d08bc4bacfd
+  data.tar.gz: aaf8d8a4bc560b21c0983e93348e95087cc8b2b0
 SHA512:
-  metadata.gz: b3f4810648009a763b42960a02c52d7c14c481e6fc733aafbc7b1fa0630d6869f6b6df7b278fcb9e44060c3058246177a63bb1d05ae4c9208fd907c4d2d9d331
-  data.tar.gz: 24aed0b491940194353a944d29fc87ec08142cb339e68ef722895ca3cf9c20246fce8a93f8cd10b49c275dae5c323e5aa42545bbc5b8f498ab578c6915372a4d
+  metadata.gz: 9bc1318738a9ec678774d8ef350bffbcd038f059e9ba601cf6f611a37ff2929872b7ce187e8bf9bf49e53689e75970730ed6a9cbea44202f7f19448ed8b65051
+  data.tar.gz: 19f367c2be4f0c7654035efd559470ce0db8d9774b903d504a571323f796022dae5f9a2685182a95352b9ee06049e264306b2ce41dca267e87eac3257a45808b

data/Gemfile.lock

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

data/lib/blsm-vd-core.rb

@@ -29,6 +29,9 @@ require 'blsm-vd-core/model/user_spread'
 require 'blsm-vd-core/model/shippingorder'
 require 'blsm-vd-core/model/vd_free_post'
 require 'blsm-vd-core/model/vd_purchase_fee_log'
+require 'blsm-vd-core/model/vd_invite_reward'
+require 'blsm-vd-core/model/vd_week_order_sale'
+require 'blsm-vd-core/model/vd_week_sale'
 require 'faraday'
 require 'blsm-mp-wx'
 
@@ -510,7 +513,7 @@ module BlsmVdCore
                           })
       seller_info.update_attributes(:purchase_fee => (seller_info.purchase_fee - earn_amount))
       #进货费变动记录
-      VdPurchaseFeeLog.create(:user_id=>seller.id,:purchase_fee=>-earn_amount,:description=>"订单完成,系统扣除",:admin_user_id=>3)
+      VdPurchaseFeeLog.create(:user_id => seller.id, :purchase_fee => -earn_amount, :description => "订单完成,系统扣除", :admin_user_id => 3)
       #通知用户
       fee_content = "亲爱的店主#{seller.username}：订单已经签收成功，您的优店管家—店主信息—进货费#{franchise_price}元，抵扣#{earn_amount},时间#{Time.now.strftime("%F %H:%M:%S")}"
       if !seller.rc_user.blank?
@@ -537,8 +540,8 @@ module BlsmVdCore
 
     # 给邀请人奖励
     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"
+    #【旧版邀请】被邀请人,金牌店主以下,渠道邀请,邀请人不为空,一个订单只能有一个结算项
+    if inviter && seller_info.created_at.to_s < Setting.old_invite_reward_expired_at && 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)}元，特此通知"
@@ -573,7 +576,6 @@ module BlsmVdCore
       end
     end
 
-
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
 
@@ -702,4 +704,118 @@ module BlsmVdCore
 
   end
 
+
+  #结算项变为物流返款时调用此方法
+  def on_clearing_item_cash_back(clearing_item_id)
+    clearing_item = ClearingItem.where(id: clearing_item_id).first
+    return ERROR_CODES[0] if !clearing_item || clearing_item.state!='CASH_BACK' || clearing_item.earn_amount.to_f < 0
+    order = clearing_item.order
+    return ERROR_CODES[0] if !order || order.ubox_order?
+    invitee = clearing_item.user
+    return ERROR_CODES[0] unless invitee
+    inviter = invitee.sq_inviter
+
+    return ERROR_CODES[4010] if VdInviteReward.where(order_id: order.id).first
+
+    vd_transaction = "clearing_item_cash_back_#{clearing_item_id}"
+    return ERROR_CODES[4010] if VdInfoSec.dangerous?(vd_transaction)
+
+    reward = 0
+    LineItem.where(:order_id => order.id).each do |line_item|
+      product_prop = line_item.product_prop
+      reward += line_item.quantity*product_prop.inviter_reward if !product_prop.blank?
+    end
+
+    if reward > 0
+      week = current_week_period_str #物流返款按自然周返款统计奖金金额
+      VdInviteReward.create({inviter_id: inviter.id, invitee_id: invitee.id, order_id: order.id, reward: reward, week: week})
+    end
+
+    #安全库录入信息
+    VdInfoSec.committed(vd_transaction)
+
+    ERROR_CODES[200]
+  end
+
+
+  #订单发货以后(通过首趣码邀请的回调)
+  def sq_invite_on_order_delivering(seller_id, order_id)
+    seller = User.where(id: seller_id).first
+    order = Order.where(id: order_id).first
+    clearing_item = ClearingItem.where(order_id: order_id).first
+
+    return ERROR_CODES[4045] unless seller
+    return ERROR_CODES[0] if !order || order.ubox_order? || order.shippingorder_id.to_i <= 0
+    return ERROR_CODES[0] unless clearing_item
+
+    vd_transaction = "on_order_delivering_#{seller_id}_#{order_id}"
+    return ERROR_CODES[4010] if VdInfoSec.dangerous?(vd_transaction)
+
+    wday = Time.now.wday #今天星期几,上一周确认的订单，并且在周二凌晨前发货的订单 上一周销售额  否则算下一周 销售额
+    week = wday==1 && clearing_item.created_at < (Time.now - 7.day).at_end_of_week ? last_week_period_str : current_week_period_str
+
+
+    os = VdWeekOrderSale.where(order_id: order.id).first
+    os.update_attributes({user_id: seller.id, week: week, sale_sum: order.total_fee}) if os
+    VdWeekOrderSale.create({order_id: order.id, user_id: seller.id, week: week, sale_sum: order.total_fee}) unless os
+
+    ws = VdWeekSale.where(user_id: seller.id, week: week).first
+    ws.update_attributes({sale_sum: VdWeekOrderSale.where(week: week, user_id: seller_id).sum(:sale_sum)}) if ws
+    VdWeekSale.create({user_id: seller.id, week: week, sale_sum: VdWeekOrderSale.where(week: week, user_id: seller_id).sum(:sale_sum)}) unless ws
+
+    #安全库录入信息
+    VdInfoSec.committed(vd_transaction)
+
+    ERROR_CODES[200]
+  end
+
+  #订单拒签以后(通过首趣码邀请的回调)
+  def sq_invite_on_order_rejecting(seller_id, order_id)
+    seller = User.where(id: seller_id).first
+    order = Order.where(id: order_id).first
+    clearing_item = ClearingItem.where(order_id: order_id).first
+
+    return ERROR_CODES[4045] unless seller
+    return ERROR_CODES[0] if !order || order.ubox_order?
+    return ERROR_CODES[0] unless clearing_item
+
+    vd_transaction = "on_order_rejecting_#{seller_id}_#{order_id}"
+    return ERROR_CODES[4010] if VdInfoSec.dangerous?(vd_transaction)
+
+    wday = Time.now.wday #今天星期几,上一周确认的订单，并且在周二凌晨前拒签的订单 上一周销售额  否则算下一周 销售额
+    week = wday==1 && clearing_item.created_at < (Time.now - 7.day).at_end_of_week ? last_week_period_str : current_week_period_str
+
+    os = VdWeekOrderSale.where(order_id: order.id, reject: 0).first #非拒签记录
+    os2 = VdWeekOrderSale.where(order_id: order.id, reject: 1).first #拒签记录
+
+    if os || (os2 && os2.sale_sum>0)
+      VdWeekOrderSale.create({order_id: order.id, user_id: seller.id, week: week, sale_sum: -order.total_fee, reject: 1})
+    elsif !os && !os2
+      VdWeekOrderSale.create({order_id: order.id, user_id: seller.id, week: week, sale_sum: 0, reject: 1})
+    end
+
+    ws = VdWeekSale.where(user_id: seller.id, week: week).first
+    ws.update_attributes({sale_sum: VdWeekOrderSale.where(week: week, user_id: seller_id).sum(:sale_sum)}) if ws
+    VdWeekSale.create({user_id: seller.id, week: week, sale_sum: VdWeekOrderSale.where(week: week, user_id: seller_id).sum(:sale_sum)}) unless ws
+
+    #安全库录入信息
+    VdInfoSec.committed(vd_transaction)
+
+    ERROR_CODES[200]
+  end
+
+
+  #上一周
+  def last_week_period_str
+    t = Time.now - 7.day
+    "#{t.strftime('%Y')}-#{t.at_beginning_of_week.strftime("%m%d")}-#{t.at_end_of_week.strftime("%m%d")}"
+  end
+
+  #这一周
+  def current_week_period_str
+    t = Time.now
+    "#{t.strftime('%Y')}-#{t.at_beginning_of_week.strftime("%m%d")}-#{t.at_end_of_week.strftime("%m%d")}"
+  end
+
+
 end

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

@@ -6,6 +6,8 @@ module BlsmVdCore
     belongs_to :order, class_name: "::BlsmVdCore::Order"
     belongs_to :clearing, class_name: "::BlsmVdCore::Clearing"
 
+    after_update :keep_commit_changes
+    after_commit :after_clearing_item_changed
     #物流服务费
     def express_service_fee
       if self.pay_type=='CODPAY'
@@ -47,5 +49,19 @@ module BlsmVdCore
       update_params[:real_amount] = ((self.order.toggle_delivery_deposit && self.order.pay_type.to_i==1) ? (self.order.actual_total.to_f+self.order.payment_total.to_f) : self.order.actual_total)
       self.update_attributes(update_params)
     end
+
+
+    #发生改变之后，记住状态的变化
+    def keep_commit_changes
+      @committed_changes = self.changes
+    end
+
+    #订单发生变化
+    def after_clearing_item_changed
+      if @committed_changes && !@committed_changes.empty?
+        BlsmVdCore.on_clearing_item_cash_back(self.id) if @committed_changes.has_key?('state') #物流返款等信息
+        @committed_changes.clear
+      end
+    end
   end
 end

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

@@ -14,14 +14,19 @@ module BlsmVdCore
 
     public
     def get_vd_score(role)
-      column = "black" == role ? "black_belt_rate" : "ordinary_rate"
       fee = 0.0
-      self.line_items.each do |item|
-        next if item.product_prop.nil?
-        rate = item.product_prop.send(column)
-        rate = VdUserScore::SCORES[:SALE_OUT_DIRECT] if rate.nil? && "normal" == role
-        rate = VdUserScore::SCORES[:SALE_OUT_INDIRECT] if rate.nil? && "black" == role
-        fee += ((item.quantity * item.franchise_price.to_f) * rate)
+      if "black" == role
+        self.line_items.each do |item|
+          next if item.product_prop.nil?
+          fee += item.quantity * item.product_prop.black_integral
+        end
+      else
+        self.line_items.each do |item|
+          next if item.product_prop.nil?
+          rate = item.product_prop.ordinary_rate
+          rate = VdUserScore::SCORES[:SALE_OUT_DIRECT] if rate.nil? && "normal" == role
+          fee += ((item.quantity * item.franchise_price.to_f) * rate)
+        end
       end
       sprintf('%0.2f', fee.to_f).to_f
     end

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

@@ -11,5 +11,10 @@ module BlsmVdCore
       array = setting.split('|')
       {order_money: array[0].to_i, reward_money: array[1].to_i}
     end
+
+    #老版的邀请奖励
+    def self.old_invite_reward_expired_at
+      Setting.where(name: 'vd_old_invite_reward_expired_at').pluck(:value)[0].to_s
+    end
   end
 end

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

@@ -7,6 +7,7 @@ module BlsmVdCore
     has_many :clearings, class_name: "::BlsmVdCore::Clearing"
     has_one :vd_user_info, class_name: "::BlsmVdCore::VdUserInfo"
     belongs_to :rc_user, class_name: "::BlsmVdCore::RcUser"
+    belongs_to :sq_inviter, class_name: '::BlsmVdCore::User', foreign_key: 'sq_from', primary_key: 'sq_code'
 
     def create_vd_user_info
       unless self.vd_user_info

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

@@ -0,0 +1,23 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdInviteReward < BlsmVdCore::BaseRecord
+    self.table_name='vd_invite_rewards'
+    belongs_to :inviter, foreign_key: 'inviter_id', class_name: '::BlsmVdCore::User'
+    belongs_to :invitee, foreign_key: 'invitee_id', class_name: '::BlsmVdCore::User'
+    belongs_to :order, class_name: "::BlsmVdCore::Order"
+    belongs_to :clearing_item, class_name: "::BlsmVdCore::ClearingItem"
+
+    #week 格式：2017-0220-0226
+    before_create :generate_week
+
+    private
+
+    #默认生成上一周的week开始日+结束日
+    def generate_week
+      unless self.week
+        t = Time.now - 7.day
+        self.week = "#{t.strftime('%Y')}-#{t.at_beginning_of_week.strftime("%m%d")}-#{t.at_end_of_week.strftime("%m%d")}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdWeekOrderSale <  BlsmVdCore::BaseRecord
+    self.table_name='vd_week_order_sales'
+    belongs_to :order
+    before_create :generate_week
+    #week 格式：2017-0220-0226
+
+    private
+
+    #默认生成上一周的week开始日+结束日
+    def generate_week
+      unless self.week
+        t = Time.now - 7.day
+        self.week = "#{t.strftime('%Y')}-#{t.at_beginning_of_week.strftime("%m%d")}-#{t.at_end_of_week.strftime("%m%d")}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdWeekSale < BlsmVdCore::BaseRecord
+    self.table_name='vd_week_sales'
+    belongs_to :user, class_name: "::BlsmVdCore::User"
+    before_create :generate_week
+    #week 格式：2017-0220-0226
+
+    private
+
+    #默认生成上一周的week开始日+结束日
+    def generate_week
+      unless self.week
+        t = Time.now - 7.day
+        self.week = "#{t.strftime('%Y')}-#{t.at_beginning_of_week.strftime("%m%d")}-#{t.at_end_of_week.strftime("%m%d")}"
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.9.5"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -201,11 +201,14 @@ files:
 - lib/blsm-vd-core/model/user_spread.rb
 - lib/blsm-vd-core/model/vd_free_post.rb
 - lib/blsm-vd-core/model/vd_info_sec.rb
+- lib/blsm-vd-core/model/vd_invite_reward.rb
 - lib/blsm-vd-core/model/vd_mp_msg.rb
 - lib/blsm-vd-core/model/vd_purchase_fee_log.rb
 - lib/blsm-vd-core/model/vd_rc_msg_notify.rb
 - lib/blsm-vd-core/model/vd_user_info.rb
 - lib/blsm-vd-core/model/vd_user_score.rb
+- lib/blsm-vd-core/model/vd_week_order_sale.rb
+- lib/blsm-vd-core/model/vd_week_sale.rb
 - lib/blsm-vd-core/model/vd_wx_pay.rb
 - lib/blsm-vd-core/version.rb
 homepage: https://bitbucket.org/Xiaopuzhu/blsm-vd-core