blsm-vd-core 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bbba240c6e96672ee38bfa3da3c664de0a80444
-  data.tar.gz: 18526f60cba5e3b0c77d2e043a9d433c33aa87f3
+  metadata.gz: ad693fd9d47f9e810039d67e597981dfcb0234c1
+  data.tar.gz: ae0e966c7efbd5e712d47dfaeef7a520906d5a24
 SHA512:
-  metadata.gz: a227abd61ff46e3a8266350e5dcefb30162313f5b881fce2a8681d7448df08db6770082a82966e573899f3596d326d5a6fd49015ac64e66f9467a6d0a1ce2555
-  data.tar.gz: 4b671fb1bc598d98f2a84032d496762d0e3df35b8e118e41da6ba8f58c78baf0d23984312916dccb34a8e336df663654b2d6eb9bc62e9426a8d79c6b0dcb1410
+  metadata.gz: 96d6faf48800aa549ad251161c81547a01dbccee1e75debed813a8c7a243c05412bc2f62b37a8dc3bc4b936555daf817428a5ea1cb9e742096e9c4aac3940246
+  data.tar.gz: 016d63046ab6d9178755913fc0e3fcbd42f162af321eea76f7df6deb7d2288000d0d6942431d0fbf0a7698407458ad8a0b21c66b1b4cffcdb500a5b1bd3f2f72

data/Gemfile.lock

@@ -34,7 +34,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    blsm-mp-wx (0.2.8)
+    blsm-mp-wx (0.3.2)
     builder (3.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
@@ -116,7 +116,7 @@ DEPENDENCIES
   activemodel (~> 3.2)
   activerecord (~> 3.2)
   activesupport (~> 3.2)
-  blsm-mp-wx (~> 0.2.8)
+  blsm-mp-wx (~> 0.3.2)
   blsm-vd-core!
   bundler (~> 1.9)
   faraday (~> 0.9)

data/blsm-vd-core.gemspec

@@ -37,6 +37,6 @@ 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.2.8"
+  spec.add_development_dependency "blsm-mp-wx", "~> 0.3.2"
   spec.add_development_dependency "pry"
 end

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

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

data/lib/blsm-vd-core.rb

@@ -362,7 +362,7 @@ module BlsmVdCore
     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)
+    return ERROR_CODES[401] if !order || !order.application
 
 
     return ERROR_CODES[0] unless order.clearing_items
@@ -386,16 +386,19 @@ module BlsmVdCore
     # seller_info = seller.create_vd_user_info
     # leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
 
+    content = "您的订单(编号#{order.number})客户先签收后又拒签。"
     VdUserScore.where(score_type: score_type_str).each do |score|
       score_change = -score.score
-      if score.user && !order.ubox_order?
+      if score.user && !order.ubox_order? && score_change!=0
         score.user.create_vd_user_info.change_score(score_change)
-        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "订单#{order_id}取消"}
+
+        content = "您的队员#{seller.username}的订单(订单编号#{order.number})客户先签收后又拒签。" if seller.id != score.user.id
+        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "变动原因：#{content}"}
         BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
         VdUserScore.create({
                                user_id: score.user_id,
                                score: score_change,
-                               notes: "订单#{order.number}取消，积分扣取",
+                               notes: content,
                                score_type: vd_transaction
                            })
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement