blsm-vd-core 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67feb3654e427532062f061591b825e7eee0ac8
-  data.tar.gz: 104cc066e1b187c8acf5221ca673ef184cf978dd
+  metadata.gz: 4bbba240c6e96672ee38bfa3da3c664de0a80444
+  data.tar.gz: 18526f60cba5e3b0c77d2e043a9d433c33aa87f3
 SHA512:
-  metadata.gz: 625a4123007c7dbb1465d8fc934dd3bc7feb6be2787684e6bf508287e2577bf1e63d1a4dffab0d70238640d6f4cec2824de3d7597de7942ed4819ffdb07e3638
-  data.tar.gz: bc0481093e7840efb2664223439af524cf81c36436e843f6d3d63d6760035b3a33704a99fc128aec86123876e144b82fc4cbb77fb28f71a6df06862909823b34
+  metadata.gz: a227abd61ff46e3a8266350e5dcefb30162313f5b881fce2a8681d7448df08db6770082a82966e573899f3596d326d5a6fd49015ac64e66f9467a6d0a1ce2555
+  data.tar.gz: 4b671fb1bc598d98f2a84032d496762d0e3df35b8e118e41da6ba8f58c78baf0d23984312916dccb34a8e336df663654b2d6eb9bc62e9426a8d79c6b0dcb1410

data/Gemfile

@@ -1,4 +1,5 @@
 # source 'https://rubygems.org'
-source 'https://gems.ruby-china.org'
+#source 'https://gems.ruby-china.org'
+source 'https://ruby.taobao.org'
 # Specify your gem's dependencies in blsm-vd-core.gemspec
 gemspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.6.7)
+    blsm-vd-core (0.6.8)
 
 GEM
-  remote: https://gems.ruby-china.org/
+  remote: https://ruby.taobao.org/
   specs:
     actionmailer (3.2.7)
       actionpack (= 3.2.7)

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

@@ -6,6 +6,8 @@ module BlsmVdCore
     has_many :clearing_items, class_name: "::BlsmVdCore::ClearingItem"
     has_many :line_items, class_name: "::BlsmVdCore::LineItem"
     belongs_to :application, class_name: "::BlsmVdCore::Application", foreign_key: "application_id"
+    belongs_to :ubox_vm, class_name: "::BlsmVdCore::UboxVm", foreign_key: 'ubox_vmid', primary_key: 'ubox_vmid'
+
     encrypted_id key: 'bYqILlFMZn3xd8Cy'
 
     public
@@ -24,7 +26,7 @@ module BlsmVdCore
 
     #是否是自动售货机的订单
     def ubox_order?
-      !self.ubox_vmid.nil?
+      self.ubox_vm
     end
 
     def pay_off_line?

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

@@ -0,0 +1,13 @@
+# coding: utf-8
+module BlsmVdCore
+  class UboxVm < BlsmVdCore::BaseRecord
+    self.table_name='ubox_vms'
+    belongs_to :application, class_name: "::BlsmVdCore::Application"
+
+    #settlement 结算方式  0:默认(售价25%), 1:加盟商(售价100%)
+    def settlement_rate
+      return 1.0 if self.settlement==1
+      0.25
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/lib/blsm-vd-core.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'blsm-vd-core/version'
 require 'blsm-vd-core/model/active_record'
 require 'blsm-vd-core/model/encrypted_id'
+require 'blsm-vd-core/model/ubox_vm'
 require 'blsm-vd-core/model/order'
 require 'blsm-vd-core/model/clearing_item'
 require 'blsm-vd-core/model/line_item'
@@ -214,7 +215,7 @@ module BlsmVdCore
         data[:order_id] = order.id
         data[:order_amount] = order.total_fee
         data[:earn_amount] = order.jm_profit
-        data[:rate_of_profit] = order.ubox_order? ? 0.25 : user_info.profit_rate
+        data[:rate_of_profit] = order.ubox_order? ? order.ubox_vm.settlement_rate : user_info.profit_rate
         if order.pay_off_line?
           data[:pay_type] = 'CODPAY'
         else
@@ -240,10 +241,11 @@ module BlsmVdCore
   # * +order_id+  - 订单id
   def on_order_sale_out(seller_id, order_id)
     seller = User.where(id: seller_id).first
+    return ERROR_CODES[4045] unless seller
+
     leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
     order = Order.where(id: order_id).first
 
-    return ERROR_CODES[4045] unless seller
     return ERROR_CODES[401] if !order || !order.application || !(order.application.user_id==seller_id)
 
     #安全校验
@@ -329,7 +331,10 @@ module BlsmVdCore
 
     #分销额增加,更新未发出货物的(state=CREATE)分成比率
     seller.clearing_items.where(:state => "WAIT_TO_SURE").each do |item|
-      unless item.order.ubox_order?
+      if item.order.ubox_order?
+        item.update_attributes({:rate_of_profit => order.ubox_vm.settlement_rate,
+                                :earn_amount => item.order.jm_profit})
+      else
         item.update_attributes({:rate_of_profit => seller_info.profit_rate,
                                 :earn_amount => item.order.jm_profit})
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -192,6 +192,7 @@ files:
 - lib/blsm-vd-core/model/order.rb
 - lib/blsm-vd-core/model/product.rb
 - lib/blsm-vd-core/model/product_prop.rb
+- lib/blsm-vd-core/model/ubox_vm.rb
 - lib/blsm-vd-core/model/user.rb
 - lib/blsm-vd-core/model/vd_info_sec.rb
 - lib/blsm-vd-core/model/vd_user_info.rb
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: "首趣微店核心模块"