blsm-vd-core 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d55f917867d36eeae772420209a25f91aaef6c4
-  data.tar.gz: 940c62e5d74e1c1a4abe0ffb3c029cf6d0baa97c
+  metadata.gz: 0ed35c25312f8bc4f1e715c54554ae8e2aaaafb5
+  data.tar.gz: 63704b0c3ca6a19b365f475889bb8024aa4e5606
 SHA512:
-  metadata.gz: 5f14cd881d9a0d6ca5b3f538ccb7ff7b8995b38ee33b20cd6f515373a37f2b7c0227328f40c1c4bf3440d0b2e1669bcec8877498398f1e1a40b8af1b31b7235f
-  data.tar.gz: 16296f56e85dc3768532bf66f843801e491955696318101a3c39dc261b2f8cc2af140893d519fae1b9199761c3964175876e05243c7a5f7d11f3cdea0e26dd6e
+  metadata.gz: 533f878ce21ea6a33d423c488d6fd5b867e0d09aa426533bbdc8cb4f356b6a4d359b5457cea765662cf2b3f03ff978d54c0a8f16bea8316215778891b720b7d4
+  data.tar.gz: 1499447b01bac90fe08a8cac6d283e87d1311d922d578bcf182fa14afaf018f6abd3a4d54c93c35e71ca4d5b73f1ccb53709d11c56fb9578d67c249de4712d2c

data/Gemfile.lock

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

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

@@ -4,5 +4,19 @@ module BlsmVdCore
     self.table_name='applications'
     belongs_to :user, class_name: "::BlsmVdCore::User"
     has_many :orders, class_name: "::BlsmVdCore::Order"
+
+
+    #到付押金开关状态
+    def toggle_delivery_deposit
+      (self.toggle_setting.to_i & 0b00000001) == 1
+    end
+
+    #更新状态
+    def toggle_delivery_deposit=(toggle)
+      reload
+      update_attribute(:toggle_setting, (toggle ? (self.toggle_setting.to_i | 0b00000001) : (self.toggle_setting.to_i ^ 0b00000001)))
+      reload
+    end
+
   end
 end

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

@@ -39,10 +39,14 @@ module BlsmVdCore
     #利润率，跟销售额有关系
     def profit_rate
       return 1 if level>=2
-      return 0.5 if self.distribute_sum.to_f<750
-      return 0.7 if self.distribute_sum.to_f<1500
+      vd_wx_pay = VdWxPay.where(:user_id=>self.user_id,:return_code=>'SUCCESS',:result_code=>'SUCCESS',:vd_service_id=>2).first
+      #是否是交98元开店的店主
+      if vd_wx_pay.blank?
+        return 0.5 if self.distribute_sum.to_f<1500
+      else
+        return 0.65 if self.distribute_sum.to_f<1500
+      end
       1
     end
-
   end
 end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/blsm-vd-core.rb

@@ -100,10 +100,27 @@ module BlsmVdCore
           if !user.rc_user.blank?
             VdRcMsgNotify.create_order_finish_notify(user.username)
           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}
+            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.create_vd_user_info.channel == "market_invite" && !inviter.blank? && !BlsmVdCore::VdInfoSec.dangerous?(vd_transaction)
+          #被邀请人,金牌店主以下,渠道邀请,邀请人不为空,一个订单只能有一个结算项
+          if user.vd_user_info.level < 2 && 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)}元，特此通知"

metadata

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