blsm-vd-core 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d161c0b8e6fac2d8ae793f4703c6e2669841ae
-  data.tar.gz: 998f0655c0e0735d9f607e753742aa979c477a97
+  metadata.gz: 873645212537fb5c7da204cf71ad878828fdd52f
+  data.tar.gz: ad5daf69a9d2f9a593f022d135527f27daa4318f
 SHA512:
-  metadata.gz: 13a6df8872910aff61e248fd72a5bd2da01f217e7f7cf1a05a20d8bd96b93458d743233aea4cfa5315de4902f6b49b109c2be7c7a49bbf5ebfed4eba333964d4
-  data.tar.gz: 674a4bae04f183559d5b6137643e19e0d9742b84c5605037b6b7bb3dcb4425745bddd16a4d0e70d5aa5967532561770f1f5e922a655bcc3d2d553315d3bcc877
+  metadata.gz: ae58f7927c467d40a82d73db7c9da7e9e74aba811cd83b41bfedc630d9997682dac4680da68b352c8dfbd17d77066600c4b2d1cb47abb64e4eddf3ef35f0b53b
+  data.tar.gz: eb4853163bed3b252e94c8d8f10fad745023f7ae4382b80863d8a75b3f142946edd6dddcd67da584eb59825bdfc249d59add40febf4459b870a35e9fc69d67b8

data/Gemfile.lock

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

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "blsm/vd/core"
+require "blsm-vd-core"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/blsm-vd-core.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|config|build.rb)/}) }
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/blsm-vd-core.rb

@@ -43,9 +43,11 @@ module BlsmVdCore
   module_function
 
   #当订单状态发生变化时，调用此方法
+  # 包含：订单被发出去 +order_sale_out+
+  #      创建结算项  +create_clearing_item+
   #==== Parameters
   # * +order_id+  - 订单id
-  def order_state_change(order_id)
+  def on_order_state_change(order_id)
     order = Order.where(id: order_id).first
     clearing_item = ClearingItem.where(order_id: order.id).first if order
 
@@ -58,6 +60,11 @@ module BlsmVdCore
       return create_clearing_item(order_id)
     end
 
+    #已发货，准备收货=>订单被售卖出去
+    if order.state.to_s.include?('已发货，准备收货')
+      return on_order_sale_out(order.application.user_id, order_id) if order.application
+    end
+
     #订单被取消=>删除结算项
     if order.state.to_s.include?('订单取消')
       order.clearing_items.each { |item|
@@ -79,7 +86,7 @@ module BlsmVdCore
   #==== Parameters
   # * +order_id+  - 订单id
   # * +sign_type+  - 签收状态：ENUM('sign_ok','sign_fail')
-  def order_sign_handle(order_id, sign_type)
+  def on_order_signed(order_id, sign_type)
     order = Order.where(id: order_id).first
     clearing_item = ClearingItem.where(order_id: order.id).first if order
 
@@ -192,7 +199,7 @@ module BlsmVdCore
   #==== Parameters
   # * +seller_id+  - 销售员的id
   # * +order_id+  - 订单id
-  def order_sale_out(seller_id, order_id)
+  def on_order_sale_out(seller_id, order_id)
     seller = User.where(id: seller_id).first
     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

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - saxer
@@ -152,9 +152,6 @@ files:
 - bin/console
 - bin/setup
 - blsm-vd-core.gemspec
-- build.py
-- build.rb
-- config/database.yml
 - lib/blsm-vd-core.rb
 - lib/blsm-vd-core/model/active_record.rb
 - lib/blsm-vd-core/model/application.rb

data/build.py

@@ -1,7 +0,0 @@
-import os
-import sys
-
-os.system("mv config/database.yml spec/")
-os.system("touch config/database.yml")
-os.system("gem build blsm-vd-core.gemspec")
-os.system("mv spec/database.yml config/")

data/build.rb

@@ -1,4 +0,0 @@
-system("mv config/database.yml spec/")
-system("touch config/database.yml")
-system("gem build blsm-vd-core.gemspec")
-system("mv spec/database.yml config/")