blsm-vd-core 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88eb769d8f1f8b766c331a5262a921eae496eca0
-  data.tar.gz: cd122a4b340b889ce0b461ebda72032d3d76f714
+  metadata.gz: a069ba05cde82b661959f01d83fe63f1b441189d
+  data.tar.gz: b0c79284b266fc27f7f6791bbce34f495ac6dbe0
 SHA512:
-  metadata.gz: 518848866205b77e4df608314fce2ebf0f83a77584e0a731a163977c4acb5f3a4d0022f8aee9101c9d69d032b94ed73b14b212a9aad5e8e63a23d92d6ec0e0f7
-  data.tar.gz: 6bde110e953670e59fb30f0340e4feb392d135d73005e985de5c14257053e7def01aee1c1132bb6848b8018518189acd8cda7803454f1666f45823522d6fd151
+  metadata.gz: 496bfa14705c081fe1cd753ba05da262555b623b038c93947a3cb07f0bcfc3a7700786f085e288fd0c7826d3a92ec7de863a3dce7d1f4eaf18d09ae707d1740e
+  data.tar.gz: be53804e26b9b2eb79e665e90cce1f141c87d774c8139f922d32279dcada6dd409b2e2cce5c8e44492517921bffce70e660bdf802619e91bab0e5dc89c2ffaec

data/Gemfile.lock

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

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

@@ -28,7 +28,7 @@ module BlsmVdCore
       update_params[:notes] = note
       update_params[:state] = 'CASH_BACK'
       if self.order.toggle_delivery_deposit && self.order.pay_type.to_i==1
-        update_params[:real_amount] = self.order.payment_total.to_f+self.express_service_fee - (self.earn_amount - self.order_amount + self.order.real_shipping_charge * 2) - reduce_real_amount
+        update_params[:real_amount] = self.express_service_fee - (self.earn_amount - self.order_amount) - reduce_real_amount
       else
         update_params[:real_amount] = self.express_service_fee - (self.earn_amount - self.order_amount + self.order.real_shipping_charge * 2) - reduce_real_amount
       end

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

@@ -6,6 +6,7 @@ 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 :shippingorder, class_name: "::BlsmVdCore::Shippingorder", foreign_key: "shippingorder_id"
     belongs_to :ubox_vm, class_name: "::BlsmVdCore::UboxVm", foreign_key: 'ubox_vmid', primary_key: 'ubox_vmid'
 
     encrypted_id key: 'bYqILlFMZn3xd8Cy'

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

@@ -0,0 +1,6 @@
+# encoding: utf-8
+module BlsmVdCore
+  class Shippingorder < BlsmVdCore::BaseRecord
+    self.table_name='shippingorders'
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

data/lib/blsm-vd-core.rb

@@ -25,6 +25,7 @@ require 'blsm-vd-core/model/application'
 require 'blsm-vd-core/model/setting'
 require 'blsm-vd-core/model/recharge_spread'
 require 'blsm-vd-core/model/user_spread'
+require 'blsm-vd-core/model/shippingorder'
 require 'faraday'
 require 'blsm-mp-wx'
 
@@ -74,6 +75,18 @@ module BlsmVdCore
       return on_order_canceled(order.application.user_id, order_id) if order.application
     end
 
+    #订单被拒签=>创建shippingorder 拒签的记录
+    if order.state.to_s.include?('客户拒签，原件返回')
+      shippingorder = Shippingorder.where(:id=>order.shippingorder_id).first
+      if shippingorder.blank?
+        shippingorder = Shippingorder.create(:refuse_at=>Time.now)
+        order.update_attributes(:shippingorder_id=>shippingorder.id)
+      else
+        shippingorder.update_attributes(:refuse_at=>Time.now)
+      end
+      return
+    end
+
     #在线支付（客户签收，订单完成）=>确认结算项
     if order.state.to_s.include?('客户签收，订单完成')
       create_clearing_item(order_id) if order.ubox_order?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -195,6 +195,7 @@ files:
 - lib/blsm-vd-core/model/rc_user.rb
 - lib/blsm-vd-core/model/recharge_spread.rb
 - lib/blsm-vd-core/model/setting.rb
+- lib/blsm-vd-core/model/shippingorder.rb
 - lib/blsm-vd-core/model/ubox_vm.rb
 - lib/blsm-vd-core/model/user.rb
 - lib/blsm-vd-core/model/user_spread.rb