blsm-vd-core 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3694b8379171653439fe422d0b8b2a108ae17117
-  data.tar.gz: dea86659dcabea0b11652b683d3d1691ca20d9d0
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWU0YmY2YmQ4MjM2Y2ZhZjYyZmQ4ZWUzNDIzNmJkMGY0YzY1MDk1MA==
+  data.tar.gz: !binary |-
+    ZWMyNmQ1NzMyMGM0ZmJjYjFjOTIxNTMzNDVkZTgzYmU3NDA5ZTJlNQ==
 SHA512:
-  metadata.gz: c38cb4638f016518ec2d3bbc764f555cda5acb9ead6a567110396678f31a52ffe61b530ff1a50daf10286270647c754af523b747dfa5e3d7de602eb36a876649
-  data.tar.gz: c62bf37eb8e08c37b1227b7c28b785fd75c58b22d52aacb0e5cdc9bb9f65d7585db9ea3f3c5e425730a28326879f6ba7f0a202b58805fd88bc04391a50f9cd14
+  metadata.gz: !binary |-
+    MzU0YTkxOGU3MTFiMjRmMTA2ZmE2YWQ3Y2M3NmZjYmNhYzI3N2U4ZDlhODA1
+    MmNkOTRlNGNjMDIwOWE2YjFjNDM2ZDU3ODI5OGEzNjFhOTM5OGExMzI4ZWYz
+    MTYyMmI0ZGJkMzQ1ZTVhZGQ0YWZlMzUwMWZlZTU2ZDE5MzMxZjE=
+  data.tar.gz: !binary |-
+    M2VmNjZiNzViMmRiYzQ5ODg2ZjUyYjcwYTVjMjliM2Q4MDI0Y2QxODg3NmZk
+    N2RjZjA3MTYzN2U4NjBjYzc0NzAzNWViNDRjYWJmMDQ2MmM1NGNkMDU1NWQ3
+    NzU5MTkyZTFkZTQzMGNhNjdiNTJhNzgzMGFmNTZkZDNkZWFiMmI=

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: .
+  specs:
+    blsm-vd-core (0.1.8)
+
+GEM
+  remote: https://ruby.taobao.org/
+  specs:
+    actionmailer (3.2.7)
+      actionpack (= 3.2.7)
+      mail (~> 2.4.4)
+    actionpack (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
+      builder (~> 3.0.0)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    hike (1.2.3)
+    i18n (0.7.0)
+    journey (1.0.4)
+    json (1.8.3)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.11.0)
+    multipart-post (2.0.0)
+    mysql2 (0.3.17)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (3.2.7)
+      actionmailer (= 3.2.7)
+      actionpack (= 3.2.7)
+      activerecord (= 3.2.7)
+      activeresource (= 3.2.7)
+      activesupport (= 3.2.7)
+      bundler (~> 1.0)
+      railties (= 3.2.7)
+    railties (3.2.7)
+      actionpack (= 3.2.7)
+      activesupport (= 3.2.7)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.4.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (~> 3.2)
+  activerecord (~> 3.2)
+  activesupport (~> 3.2)
+  blsm-vd-core!
+  bundler (~> 1.9)
+  faraday (~> 0.9)
+  mysql2 (~> 0.3.16)
+  rails (~> 3.2)
+  rake (~> 10.0)
+  rspec (~> 3.2)
+
+BUNDLED WITH
+   1.10.3

data/blsm-vd-core.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activemodel", "~> 3.2"
   spec.add_development_dependency "activerecord", "~> 3.2"
   spec.add_development_dependency "activesupport", "~> 3.2"
+  spec.add_development_dependency "faraday", "~> 0.9"
 end

data/build.py

@@ -0,0 +1,7 @@
+import os
+import sys
+
+os.system("mv config/database.yml spec/")
+os.system("touch config/database.yml")
+os.system("gem build blsm-vd-core.gemspec")
+os.system("mv spec/database.yml config/")

data/build.rb

@@ -0,0 +1,4 @@
+system("mv config/database.yml spec/")
+system("touch config/database.yml")
+system("gem build blsm-vd-core.gemspec")
+system("mv spec/database.yml config/")

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

@@ -2,12 +2,7 @@ module BlsmVdCore
 
   def self.load_config
     config_path = Rails.root ? File.join(Rails.root, "config", "database.yml") : './config/database.yml'
-    yaml = File.open(config_path)
-    conf = ''
-    yaml.each do |line|
-      conf +=line
-    end
-    conf
+    File.open(config_path).inject('') { |text, line| text+line }
   end
 
   class BaseRecord < ActiveRecord::Base

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

@@ -0,0 +1,8 @@
+# coding: utf-8
+module BlsmVdCore
+  class Clearing < BlsmVdCore::BaseRecord
+    self.table_name='clearings'
+    has_many :clearing_items, class_name: "::BlsmVdCore::ClearingItem"
+    belongs_to :user, class_name: "::BlsmVdCore::User"
+  end
+end

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

@@ -0,0 +1,44 @@
+# coding: utf-8
+module BlsmVdCore
+  class ClearingItem < BlsmVdCore::BaseRecord
+    self.table_name='clearing_items'
+    belongs_to :user, class_name: "::BlsmVdCore::User"
+    belongs_to :order, class_name: "::BlsmVdCore::Order"
+    belongs_to :clearing, class_name: "::BlsmVdCore::Clearing"
+    
+    #物流服务费
+    def express_service_fee
+      if self.pay_type=='CODPAY'
+        return 5
+      end
+      0
+    end
+    #可能的（预计）收入
+    def possible_profit
+      if self.state=='CASH_BACK'
+        return sprintf('%0.2f', (self.real_amount - self.order_amount + self.earn_amount)* self.rate_of_profit - self.express_service_fee).to_f
+      end
+      sprintf('%0.2f', self.earn_amount * self.rate_of_profit - self.express_service_fee).to_f
+    end
+  
+    def marking_refuse(note, reduce_real_amount = 0)
+      update_params = {}
+      update_params[:notes] = note
+      update_params[:state] = 'CASH_BACK'
+      update_params[:real_amount] = self.express_service_fee - (self.earn_amount - self.order_amount + self.order.real_shipping_charge * 2) - reduce_real_amount
+      #here to avoid muliti time making refuse
+      update_params.delete(:real_amount) if self.possible_profit < 0.0
+      update_params[:rate_of_profit] = 1
+      self.update_attributes(update_params)
+    end
+  
+    def marking_confirm(note)
+      update_params = Hash.new
+      update_params[:notes] = note
+      update_params[:state] = 'CASH_BACK'
+      update_params[:earn_amount] = self.order.jm_profit
+      update_params[:real_amount] = self.order.actual_total
+      self.update_attributes(update_params)
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# coding: utf-8
+module BlsmVdCore
+  class LineItem < BlsmVdCore::BaseRecord
+    self.table_name='line_items'
+    belongs_to :order, class_name: "::BlsmVdCore::Order"
+    belongs_to :product_prop, class_name: "::BlsmVdCore::ProductProp"
+    belongs_to :product, class_name: "::BlsmVdCore::Product"
+  end
+end

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

@@ -2,11 +2,78 @@
 module BlsmVdCore
   class Order < BlsmVdCore::BaseRecord
     self.table_name='orders'
+    has_many :clearing_items, class_name: "::BlsmVdCore::ClearingItem"
+    has_many :line_items, class_name: "::BlsmVdCore::LineItem"
 
-    def my_fee
-      o = Order.first
-      puts "order:#{o.inspect}"
-      "my_fee:{柳溪}"
+  public
+    #加盟商（微店主）赚取的利润（直接利润）
+    def jm_profit
+      jm_cost = 0
+      if self.line_items
+        self.line_items.each do |item|
+          unless item.product_prop && item.product_prop.franchise_price
+            next
+          end
+          jm_cost += item.quantity * (item.product_prop.franchise_price.to_f)
+        end
+      end
+      sprintf('%0.2f', (self.total_fee - self.shipping_charge - jm_cost).to_f).to_f
     end
+
+    #总的加盟费（供货价）
+    def jm_fee
+      fee = 0
+      if self.line_items
+        self.line_items.each do |item|
+          fee += item.quantity * item.franchise_price.to_f
+        end
+      end
+      sprintf('%0.2f', fee.to_f).to_f
+    end
+
+    #订单总金额
+    def total_fee
+      sprintf('%0.2f', (self.item_total + self.shipping_charge).to_f).to_f
+    end
+    #真实的运费
+    def real_shipping_charge
+      if self.shipping_charge > 0
+        return self.shipping_charge
+      end
+  
+      conn = Faraday.new(:url => 'http://'+"api.aihuo360.com")
+      response = conn.get do |req|
+        req.url '/v2/shipping_charges'
+        req.params[:province] = self.shipping_province
+        req.params[:city] = self.shipping_city
+        req.params[:district] = self.shipping_district
+      end
+      begin
+        result = JSON.parse(response.body)
+        if self.pay_type==1
+          result['shipping_charges'][0]['cash_on_delivery'].to_f
+        else
+          result['shipping_charges'][0]['pay_online'].to_f
+        end
+      rescue
+        15
+      end
+    end
+    private
+  
+    def self.valid_update?(clearing_item)
+      if clearing_item[:state] == 'CASH_BACK'
+        return false
+      end
+      return true
+    end
+    def self.latest_notes(clearing_item, user, action)
+      notes = "#{user[:username] if user}"
+      date_now = DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d %H:%M:%S').to_s
+      notes = (clearing_item[:notes] ? clearing_item[:notes]+'<br>' : '')+"#{date_now} #{notes} #{action}"
+      return notes
+    end
+
+    alias :franchise_sum :jm_fee
   end
 end

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

@@ -0,0 +1,8 @@
+# coding: utf-8
+module BlsmVdCore
+  class Product < BlsmVdCore::BaseRecord
+    self.table_name='products'
+    has_many :product_props, class_name: "::BlsmVdCore::ProductProp"
+    has_many :line_items, class_name: "::BlsmVdCore::LineItem"
+  end
+end

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

@@ -0,0 +1,8 @@
+# coding: utf-8
+module BlsmVdCore
+  class ProductProp < BlsmVdCore::BaseRecord
+    self.table_name='product_props'
+    has_many :line_items, class_name: "::BlsmVdCore::LineItem"
+    belongs_to :product, class_name: "::BlsmVdCore::Product"
+  end
+end

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

@@ -0,0 +1,24 @@
+# coding: utf-8
+module BlsmVdCore
+  class User < BlsmVdCore::BaseRecord
+    self.table_name='users'
+    has_many :clearing_items, class_name: "::BlsmVdCore::LineItem"
+    has_many :clearings, class_name: "::BlsmVdCore::Clearing"
+    has_one :vd_user_info, class_name: "::BlsmVdCore::VdUserInfo"
+
+    def create_vd_user_info
+      unless self.vd_user_info
+        return VdUserInfo.create({
+                                     user_id: self.id
+                                 })
+      end
+      self.vd_user_info
+    end
+
+    #是否是黑带微店主
+    def is_vd_black?
+      info = self.vd_user_info || self.create_vd_user_info
+      info.is_black?
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdUserInfo < BlsmVdCore::BaseRecord
+    self.table_name='vd_user_infos'
+    validates_uniqueness_of :user_id
+    belongs_to :user, class_name: '::BlsmVdCore::User'
+    belongs_to :supervisor, class_name: '::BlsmVdCore::User'
+
+    #是否是黑带
+    def is_black?
+      self.vd_role == 'black'
+    end
+
+    #利润率，跟销售额有关系
+    def profit_rate
+      return 0.5 if self.sale_sum.to_f<1500
+      return 0.7 if self.sale_sum.to_f<3000
+      1
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdUserScore < BlsmVdCore::BaseRecord
+    self.table_name='vd_user_scores'
+    belongs_to :user, class_name: '::BlsmVdCore::User'
+    SCORES = {
+        INVITE: 5, #邀请他人，邀请者获取的积分数
+        BE_INVITED: 5, #被人邀请，被邀请者获取的积分数
+        SALE_OUT_DIRECT: 5/100.0, #订单完成，微店主直接获取的积分比
+        SALE_OUT_INDIRECT: 20/100.0, #订单完成，微店主的队长获取的积分比
+        SCORE_TO_MONEY: 1.1/1 #积分变现（积分抵货款的比例）
+    }
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.1.6"
+  VERSION = "0.1.9"
 end

data/lib/blsm-vd-core.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'cgi'
 require 'rails'
 require 'active_model'
@@ -6,9 +7,117 @@ require 'active_support'
 require 'blsm-vd-core/version'
 require 'blsm-vd-core/model/active_record'
 require 'blsm-vd-core/model/order'
-
+require 'blsm-vd-core/model/clearing_item'
+require 'blsm-vd-core/model/line_item'
+require 'blsm-vd-core/model/clearing'
+require 'blsm-vd-core/model/product'
+require 'blsm-vd-core/model/product_prop'
+require 'blsm-vd-core/model/vd_user_info'
+require 'blsm-vd-core/model/vd_user_score'
+require 'blsm-vd-core/model/user'
+require 'faraday'
 module BlsmVdCore
   class << self
     attr_accessor :db_config
   end
+  module_function
+  #订单状态发生变化
+  def order_state_change(order_id)
+    order = Order.find_by_id(order_id)
+    return "404-order" if order.nil?
+    clearing_item = ClearingItem.find_by_order_id(order.id)
+    return "404-clearing-item" if clearing_item.nil?
+    #在线支付，客户签收，订单完成
+    if order.pay_type == 0 && order.state=='客户签收，订单完成'
+      clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'})
+      return "200-zxzf-clearing-item"
+    end
+    if order.state.to_s.include?('订单取消')
+      clearing_items = order.clearing_items
+      if clearing_items
+        clearing_items.each { |item|
+          if item.state != 'CASH_BACK'
+            item.destroy
+          end
+        }
+        return "200-delete-clearing-item"
+      end
+    end
+  end
+  #物流返款
+  def order_sign_handle(order_id,sign_type)
+    order = Order.find_by_id(order_id)
+    return "404-order" if order.nil?
+    begin
+      clearing_item = ClearingItem.find_by_order_id(order.id)
+      return "404-clearing-item" if clearing_item.nil?
+      if sign_type == "sign_ok" && !Order.valid_update?(clearing_item)
+        return "already-cash-back"
+      end
+    rescue Exception, e
+      return "500-error"
+    end
+
+    result = if sign_type == "sign_ok"
+      if clearing_item.pay_type == 'ZXZF'
+        puts "非货到付款订单,不需要做啥操作"
+        return "zxzf-not-need-handle"
+      end
+      note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记物流返款')
+      clearing_item.marking_confirm(note)
+    elsif sign_type == "sign_fail"
+      if clearing_item.clearing && clearing_item.clearing.state == "BALANCED"
+        i_clearing = clearing_item.dup
+        i_clearing.clearing_id = nil
+        i_clearing.save
+        note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记签收失败')
+        i_clearing.marking_refuse(note, clearing_item.possible_profit)
+      else
+        note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记签收失败')
+        clearing_item.marking_refuse(note)
+      end
+    end
+    sign_column = (sign_type == "sign_ok") ? "sign_ok" : "sign_fail"
+    if result
+      "sign-#{sign_column}-success"
+    else
+      "sign-#{sign_column}-error"
+    end
+  end
+
+  #【积分获取】商品售卖出去
+  #微店主的积分会根据商品总的供货价的
+  #商品卖出，微店主会获取直接的 订单供货价 * +SCORES[:SALE_OUT_DIRECT]+ 积分
+  #        微店主所属的队长（直接上级）获取 订单供货价 * +SCORES[:SALE_OUT_INDIRECT]+ 积分
+  #==== Parameters
+  # * +seller_id+  - 销售员的id
+  # * +order_id+  - 订单id
+  def product_sale_out(seller_id, order_id)
+    seller = User.where(id: seller_id).first
+    leader = User.where("id in(select supervisor_id from vd_user_infos where user_id=#{seller_id})").first
+    order = Order.where(id: order_id).first
+
+    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 #供货价总和
+
+    #积分获取
+    seller_info.update_attributes({:score => seller_info.score.to_f+franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]})
+    leader_info.update_attributes({:score => leader_info.score.to_f+franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]}) if leader_info
+
+    #积分历史
+    VdUserScore.create({
+                           user_id: seller_id,
+                           score: franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT],
+                           notes: "分销#{franchise_sum}元,订单#{order_id}完成"
+                       })
+    VdUserScore.create({
+                           user_id: leader.id,
+                           score: franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT],
+                           notes: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{order_id}完成"
+                       }) if leader_info
+
+    #TODO:销售额、分销额增加
+  end
 end

metadata

@@ -1,127 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - saxer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 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'
 description: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
 email:
 - 15201280641@qq.com
@@ -129,18 +143,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - blsm-vd-core.gemspec
+- build.py
+- build.rb
 - config/database.yml
 - lib/blsm-vd-core.rb
 - lib/blsm-vd-core/model/active_record.rb
+- lib/blsm-vd-core/model/clearing.rb
+- lib/blsm-vd-core/model/clearing_item.rb
+- lib/blsm-vd-core/model/line_item.rb
 - lib/blsm-vd-core/model/order.rb
+- lib/blsm-vd-core/model/product.rb
+- lib/blsm-vd-core/model/product_prop.rb
+- lib/blsm-vd-core/model/user.rb
+- lib/blsm-vd-core/model/vd_user_info.rb
+- lib/blsm-vd-core/model/vd_user_score.rb
 - lib/blsm-vd-core/version.rb
 homepage: https://bitbucket.org/Xiaopuzhu/blsm-vd-core
 licenses:
@@ -153,12 +178,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: []