blsm-vd-core 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2e4c393f9c216eaed675b271630dc4e3c510083
-  data.tar.gz: 102b4dbcb46114b6752f3f27bf2e5d201e049fb9
+  metadata.gz: 2d2f147d142fcdbb81884b49b41f7b5b6e22b332
+  data.tar.gz: 9273037e4c488ee026ce56ae98a7c96701712b16
 SHA512:
-  metadata.gz: df32d33db6fdae4dd501e0581285349da4b53f6c63b04e01d7a8acf24f5214c4fc690ed34f9333c242d2107307782142ab5a7b30ff5450a2406bb95da3ef8281
-  data.tar.gz: e0f73430145cc0ed6854552a3ed1276bc14393d5f73968775b8d7084433e5212d1f2f6425e914e8b574db9db40a166ae49df95b2b986aaedf2c32626b8332f19
+  metadata.gz: c5a3a48e786102f09866f13a883fd862f2a0b38fdcc1a51cd6884102dbd1ace22238b7945738caf8ad09b8744d56565f517d743b33ef006a22408cee69d651e5
+  data.tar.gz: fd8a15b07f0d653343a7a5936332d4a4b36251702cac6acb3b57ca970598c20eca9ce1a60dfdeb9f0ae615f9bb545a50c10844fa1fe8834c6e0b111e1692ded6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.4.7)
+    blsm-vd-core (0.4.8)
 
 GEM
   remote: https://ruby.taobao.org/
@@ -36,6 +36,7 @@ GEM
     arel (3.0.2)
     blsm-mp-wx (0.2.3)
     builder (3.0.0)
+    coderay (1.1.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     faraday (0.9.1)
@@ -48,11 +49,16 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.2)
     mime-types (1.19)
     multi_json (1.11.0)
     multipart-post (2.0.0)
     mysql2 (0.3.17)
     polyglot (0.3.3)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -91,6 +97,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
+    slop (3.6.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -114,6 +121,7 @@ DEPENDENCIES
   bundler (~> 1.9)
   faraday (~> 0.9)
   mysql2 (~> 0.3.16)
+  pry
   rails (~> 3.2)
   rake (~> 10.0)
   rspec (~> 3.2)

data/blsm-vd-core.gemspec

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

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

@@ -3,6 +3,7 @@ module BlsmVdCore
   class User < BlsmVdCore::BaseRecord
     self.table_name='users'
     has_many :clearing_items, class_name: "::BlsmVdCore::LineItem"
+    has_many :applications, class_name: "::BlsmVdCore::Application"
     has_many :clearings, class_name: "::BlsmVdCore::Clearing"
     has_one :vd_user_info, class_name: "::BlsmVdCore::VdUserInfo"
 

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

@@ -6,6 +6,8 @@ module BlsmVdCore
     belongs_to :user, class_name: '::BlsmVdCore::User'
     belongs_to :supervisor, class_name: '::BlsmVdCore::User'
 
+    after_save :sync_shop_state #同步用户拥有的店铺的状态
+
     LEVELS = {
         1 => '普通店主',
         2 => '金牌店主',
@@ -44,5 +46,12 @@ module BlsmVdCore
       1
     end
 
+    def sync_shop_state
+      if level >2 && self.user
+        self.user.applications.each do |shop|
+          shop.update_attributes({support_hdfk: true})
+        end
+      end
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/lib/blsm-vd-core.rb

@@ -379,33 +379,6 @@ module BlsmVdCore
       end
     end
 
-    # leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
-    # seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
-    # leader_change = -leader_order_score.score if leader_order_score
-    #
-    # #扣取积分
-    # seller_info.change_score(seller_change)
-    # leader_info.change_score(leader_change) if leader_change
-    #
-    # #积分变动通知
-    # seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}取消"}
-    # leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}取消，积分扣取"} if leader_order_score
-    # BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
-    # BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
-    #
-    # #积分历史
-    # VdUserScore.create({
-    #                        user_id: seller_id,
-    #                        score: seller_change,
-    #                        notes: "订单#{order_id}取消，积分扣取",
-    #                        score_type: vd_transaction
-    #                    })
-    # VdUserScore.create({
-    #                        user_id: leader.id,
-    #                        score: leader_change,
-    #                        notes: "成员【#{seller.username}】订单#{order_id}取消，积分扣取",
-    #                        score_type: vd_transaction
-    #                    }) if leader_order_score
 
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
@@ -450,40 +423,6 @@ module BlsmVdCore
       end
     end
 
-    #卖家和团队领导的信息
-    # seller_info = seller.create_vd_user_info
-    # leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
-    #
-    # #供货价总和、应该扣取的积分总额
-    # franchise_sum = order.franchise_sum
-    # leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
-    # seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
-    # leader_change = -leader_order_score.score if leader_order_score
-    #
-    # #扣取积分
-    # seller_info.change_score(seller_change)
-    # leader_info.change_score(leader_change) if leader_change
-    #
-    # #积分变动通知
-    # seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "订单#{order_id}拒签"}
-    # leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取"} if leader_order_score
-    # BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
-    # BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
-    #
-    # #积分历史
-    # VdUserScore.create({
-    #                        user_id: seller_id,
-    #                        score: seller_change,
-    #                        notes: "订单#{order_id}拒签，积分扣取",
-    #                        score_type: vd_transaction
-    #                    })
-    # VdUserScore.create({
-    #                        user_id: leader.id,
-    #                        score: leader_change,
-    #                        notes: "成员【#{seller.username}】订单#{order_id}拒签，积分扣取",
-    #                        score_type: vd_transaction
-    #                    }) if leader_order_score
-
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - saxer
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com