blsm-vd-core 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293917be8067c41e3157f96f222dde205b060388
-  data.tar.gz: 620482a81a17f90c57b1a9b2636e233d3130da9c
+  metadata.gz: a8927909fedb3e3426a16fcf983ce22457b1c12b
+  data.tar.gz: 9a7204665fdb30589b81c6bf17ca56539a1e2ecc
 SHA512:
-  metadata.gz: c7f774540efce1127dbee47d451d6ce4c6d7e63b89540647e3c9a9f6f9ff20daeee70d174f3eaa9dfbb2c7b6975b49578ba482676c0dec72f47d7dde105f8200
-  data.tar.gz: 931b15330311351aa070e057315522b80f06111dc2e7da50eabe19db6e128cb5a78f5703a0b8dfd186e1f304971237d819b8b1b6b06c0bc62774d7ab250097d1
+  metadata.gz: f71a8e38bcf9662f1557223e9a83e79fdf20d28b01650e7d30f56b9a2e0e0def610fed2148b96263bff1af2be0dd92902580ddc9357ac5cdbe5ab3f5b9ca2463
+  data.tar.gz: 880df049524b7228d0243265e13fd39d468cbc2d9661f30c1de5d508dede092079f851eb84daab42a07cdc841d3592d22334e7250e53c1bb756ca709facc39d2

data/Gemfile.lock

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

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/blsm-vd-core.rb

@@ -62,9 +62,9 @@ module BlsmVdCore
     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?('已发货，准备收货')
+    #   return on_order_sale_out(order.application.user_id, order_id) if order.application
+    # end
 
     #订单被取消=>删除结算项(扣除積分)
     if order.state.to_s.include?('订单取消')
@@ -72,8 +72,9 @@ module BlsmVdCore
     end
 
     #在线支付（客户签收，订单完成）=>确认结算项
-    if order.pay_on_line? && order.state=='客户签收，订单完成'
-      clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'}) if clearing_item
+    if order.state.to_s.include?('客户签收，订单完成')
+      on_order_sale_out(order.application.user_id, order_id) if order.application
+      clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'}) if clearing_item && order.pay_on_line?
       return ERROR_CODES[200]
     end
 
@@ -81,7 +82,7 @@ module BlsmVdCore
   end
 
   #发送物流返款通知
-  def send_cash_back_notify(order_id,wx_app_id=nil)
+  def send_cash_back_notify(order_id, wx_app_id=nil)
     order = Order.where(id: order_id).first
     seller = order.application.user if order && order.application
     #数据校验
@@ -181,7 +182,7 @@ module BlsmVdCore
           data[:pay_type] = 'CODPAY'
         else
           data[:pay_type] = 'ZXZF'
-          data[:state] = 'CASH_BACK'
+          # data[:state] = 'CASH_BACK'
           data[:real_amount] = order.total_fee
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec