blsm-vd-core 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0cd1c3b20a562fbeed78474299a6f482d84b718
-  data.tar.gz: cadccdc61a4713cab430405e9e79c1a52d7cc2ae
+  metadata.gz: bf07cda0da972dc53eac58aca880cdfbee8ff55d
+  data.tar.gz: 1f744ca8b99dc5e9c0ba68ce695d2606d4fd4e39
 SHA512:
-  metadata.gz: 805b78c786f624d1861128c7f0feccd7af01b2df32f0007c865161559cd10f6b3d59fa8962c68938dbeb986ea7299308627bbb094ed2593c4fa6aba582a5db8b
-  data.tar.gz: 8708a269cd769c282379d641232339aebde5552d6b920be6ed546c6b1fdb31ad103235d48c41be818b00b7119dad01a0662284fae5213b3be16afb2be485c296
+  metadata.gz: 10b1a91b040c16bfa282589a7467ea989a57a7f00ed61c605af4757c6a273229e8da68d21f96d378c2374d1922505aa3a190f2582b6f7f42e0c4381089b19f4b
+  data.tar.gz: 50e46ea162f5ba6d3181a55711848e0e5972649bd79bc33800cbff5a28ddffd3cf2defa6f2b8c909d73094f203c810e244263a1aa874cccc4d5ed839f0d6f382

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.3.8)
+    blsm-vd-core (0.3.9)
 
 GEM
   remote: https://ruby.taobao.org/
@@ -34,7 +34,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    blsm-mp-wx (0.1.9)
+    blsm-mp-wx (0.2.3)
     builder (3.0.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -109,7 +109,7 @@ DEPENDENCIES
   activemodel (~> 3.2)
   activerecord (~> 3.2)
   activesupport (~> 3.2)
-  blsm-mp-wx (~> 0.1.9)
+  blsm-mp-wx (~> 0.2.3)
   blsm-vd-core!
   bundler (~> 1.9)
   faraday (~> 0.9)
@@ -117,6 +117,3 @@ DEPENDENCIES
   rails (~> 3.2)
   rake (~> 10.0)
   rspec (~> 3.2)
-
-BUNDLED WITH
-   1.10.3

data/blsm-vd-core.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord", "~> 3.2"
   spec.add_development_dependency "activesupport", "~> 3.2"
   spec.add_development_dependency "faraday", "~> 0.9"
-  spec.add_development_dependency "blsm-mp-wx", "~> 0.1.9"
+  spec.add_development_dependency "blsm-mp-wx", "~> 0.2.3"
 end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/blsm-vd-core.rb

@@ -87,10 +87,12 @@ module BlsmVdCore
   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
+    seller = order.application.user if order && order.application
 
     #数据校验
     return ERROR_CODES[404] unless order
     return ERROR_CODES[4042] unless clearing_item
+    return ERROR_CODES[4045] unless seller
     return ERROR_CODES[0] if sign_type =~ /sign_ok/ && clearing_item.state.to_s =~ /CASH_BACK/
 
     #安全校验
@@ -98,20 +100,26 @@ module BlsmVdCore
     danger = VdInfoSec.dangerous?(vd_transaction)
     return danger if danger
 
-    #货到付款（物流返款成功，订单完成）
-    if sign_type =~ /sign_ok/ && order.pay_off_line?
+    #（物流返款成功，订单完成）
+    if sign_type =~ /sign_ok/
       note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记物流返款')
       clearing_item.marking_confirm(note)
+
+      #物流返款通知
+      seller_notify = {touser: seller.openid, order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s), content: "【物流返款通知】"}
+      BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'order')
+
       VdInfoSec.committed(vd_transaction)
       return ERROR_CODES[200]
     end
 
+
     #签收失败（拒签）
     if sign_type =~ /sign_fail/
       VdInfoSec.committed(vd_transaction)
       user = order.application.user if order && order.application
       #拒签删除积分
-      on_order_sign_fail(user.id,order_id) if user
+      on_order_sign_fail(user.id, order_id) if user
       if clearing_item.clearing && clearing_item.clearing.state == "BALANCED"
         i_clearing = clearing_item.clone
         i_clearing.clearing_id = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.3
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com