blsm-vd-core 0.2.9 → 0.3.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 4fcc04f68524a98347dc91e6dbed81bbe18eda0b
-  data.tar.gz: 05269ebafde3fb68cba74e58f446fd89b55329cd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDY0OGFiZTI1ZWQyNjE1OWU3MzhlMWFlYzc2N2Q4OGM4ZWEyNmNhMQ==
+  data.tar.gz: !binary |-
+    NDhhODgzMzM4MjEzOTgyOWRlNDM3NWQyNzY0NzkxMTEyMDhhZmJjOQ==
 SHA512:
-  metadata.gz: 3e126d8e27695b3ed81885fc83fe6d9f2cfc874c81412edd746c282cdeabe1e734d538af1c7a323e26cf7e24ba8125f7b1bc19ed195f16e2f7e4049346452450
-  data.tar.gz: 7303f81e1f3d2764ca599c4ec819bac039f2fbac590a66ed85d4c713453457b63cb93e410ab5f44cf1032eb843b475d77b9ea921a00d0a2be48715722e1c4034
+  metadata.gz: !binary |-
+    NzU2ZTFlMjJjODRmZjAxOThjOTg1NGVhY2Y0MzdiYTZjNmFiNjBjMzJjYmI3
+    Mjg0YmRhNTg5YTcxZTdiMGNhNTU3MWY3NTM2Y2M2MWM2MzllZjJkNWNjZGQx
+    YWJiNjE0ZTllMzE5NmE0YmM4ZmRiMjE5MWY4NWZhNmZjOTEwNWE=
+  data.tar.gz: !binary |-
+    NWVhOGQ4NjMyNjU4N2Q0MzczYTY3Y2QzMmI3ZmNlODU0MzllMjUyZDk1N2Y5
+    OTM0ODVjYjU3YjliMTUwYWRhYjNjMmMwNDljZTQwOTFmOWE2MjBkMGNkMWYx
+    NDQ0MDMzMzY3YThhNjc5MmE4ZGM5ZjA2ZDdlZThhMmYzZDMzNmU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.2.8)
+    blsm-vd-core (0.3.1)
 
 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.8)
+    blsm-mp-wx (0.1.9)
     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.8)
+  blsm-mp-wx (~> 0.1.9)
   blsm-vd-core!
   bundler (~> 1.9)
   faraday (~> 0.9)

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.8"
+  spec.add_development_dependency "blsm-mp-wx", "~> 0.1.9"
 end

data/lib/blsm-vd-core.rb

@@ -6,6 +6,7 @@ require 'active_record'
 require 'active_support'
 require 'blsm-vd-core/version'
 require 'blsm-vd-core/model/active_record'
+require 'blsm-vd-core/model/encrypted_id'
 require 'blsm-vd-core/model/order'
 require 'blsm-vd-core/model/clearing_item'
 require 'blsm-vd-core/model/line_item'
@@ -229,6 +230,14 @@ module BlsmVdCore
     BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
     BlsmMpWx.create_msg(nil, leader.openid, leader_notify, 'score_change') if leader_notify
 
+    #订单确认提醒（黑带）
+    distribute_leader_notify = {touser: leader.openid,
+                                order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s),
+                                score_change: leader_change,
+                                money_change: leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY],
+                                content: "首趣黑带#{leader.username}，你好：成员【#{seller.username}】确认订单成功。"
+    } if leader && leader_info
+    BlsmMpWx.create_msg(nil, leader.openid, distribute_leader_notify, 'distribute') if distribute_leader_notify
 
     #积分历史
     VdUserScore.create({

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

@@ -0,0 +1,84 @@
+module BlsmVdCore
+  module EncryptedId
+
+    extend ActiveSupport::Concern
+
+    CIPHER_NAME = 'aes-256-cbc'
+    CIPHER_IV = ['1e5673b2572af26a8364a50af84c7d2a'].pack('H*')
+
+    included do
+    end
+
+    module ClassMethods
+
+      def encrypted_id(options = {})
+        cattr_accessor :encrypted_id_key
+        self.encrypted_id_key = Digest::SHA256.digest(options[:key] || encrypted_id_default_key)
+        self.define_singleton_method(:find_single, lambda { puts "foo" })
+      end
+
+      def find(*args)
+        scope = args.slice!(0)
+        options = args.slice!(0) || {}
+        if !(scope.is_a? Symbol) && has_encrypted_id? && !options[:no_encrypted_id]
+          begin
+            scope =
+                if scope.is_a? Array
+                  scope.map! { |encrypted_id| decrypt(encrypted_id_key, encrypted_id) }
+                else
+                  decrypt(encrypted_id_key, "#{scope}")
+                end
+          rescue OpenSSL::Cipher::CipherError
+            raise ActiveRecord::RecordNotFound.new("Could not decrypt ID #{args[0]}")
+          end
+        end
+        options.delete(:no_encrypted_id)
+        super(scope)
+      end
+
+      def find_by_encrypted_id(*args)
+        self.find(*args)
+      end
+
+      def has_encrypted_id?
+        true
+      end
+
+      def encrypted_id_default_key
+        name
+      end
+
+      def decrypt(key, id)
+        c = OpenSSL::Cipher::Cipher.new(CIPHER_NAME).decrypt
+        c.iv = CIPHER_IV
+        c.key = key
+        c.update([id].pack('H*')) + c.final
+      end
+
+      def encrypt(key, id)
+        c = OpenSSL::Cipher::Cipher.new(CIPHER_NAME).encrypt
+        c.iv = CIPHER_IV
+        c.key = key
+        (c.update("#{id}") + c.final).unpack('H*')[0]
+      end
+    end
+
+    def to_param
+      self.class.encrypt(self.class.encrypted_id_key, self.id)
+    end
+
+    def to_key
+      key = self.id or nil
+      if key
+        key = [self.class.encrypt(self.class.encrypted_id_key, self.id)]
+      end
+      key
+    end
+
+    def reload(options = nil)
+      options = (options || {}).merge(:no_encrypted_id => true)
+      super(options)
+    end
+
+  end
+end

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

@@ -1,10 +1,12 @@
 # coding: utf-8
 module BlsmVdCore
   class Order < BlsmVdCore::BaseRecord
+    include BlsmVdCore::EncryptedId
     self.table_name='orders'
     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"
+    encrypted_id key: 'bYqILlFMZn3xd8Cy'
 
     public
     def pay_off_line?

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.2.9"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.2
 platform: ruby
 authors:
 - saxer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: blsm-mp-wx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com
@@ -157,8 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -171,6 +171,7 @@ files:
 - lib/blsm-vd-core/model/application.rb
 - lib/blsm-vd-core/model/clearing.rb
 - lib/blsm-vd-core/model/clearing_item.rb
+- lib/blsm-vd-core/model/encrypted_id.rb
 - lib/blsm-vd-core/model/line_item.rb
 - lib/blsm-vd-core/model/order.rb
 - lib/blsm-vd-core/model/product.rb
@@ -191,12 +192,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []