blsm-vd-core 0.1.9 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWU0YmY2YmQ4MjM2Y2ZhZjYyZmQ4ZWUzNDIzNmJkMGY0YzY1MDk1MA==
-  data.tar.gz: !binary |-
-    ZWMyNmQ1NzMyMGM0ZmJjYjFjOTIxNTMzNDVkZTgzYmU3NDA5ZTJlNQ==
+SHA1:
+  metadata.gz: c8d161c0b8e6fac2d8ae793f4703c6e2669841ae
+  data.tar.gz: 998f0655c0e0735d9f607e753742aa979c477a97
 SHA512:
-  metadata.gz: !binary |-
-    MzU0YTkxOGU3MTFiMjRmMTA2ZmE2YWQ3Y2M3NmZjYmNhYzI3N2U4ZDlhODA1
-    MmNkOTRlNGNjMDIwOWE2YjFjNDM2ZDU3ODI5OGEzNjFhOTM5OGExMzI4ZWYz
-    MTYyMmI0ZGJkMzQ1ZTVhZGQ0YWZlMzUwMWZlZTU2ZDE5MzMxZjE=
-  data.tar.gz: !binary |-
-    M2VmNjZiNzViMmRiYzQ5ODg2ZjUyYjcwYTVjMjliM2Q4MDI0Y2QxODg3NmZk
-    N2RjZjA3MTYzN2U4NjBjYzc0NzAzNWViNDRjYWJmMDQ2MmM1NGNkMDU1NWQ3
-    NzU5MTkyZTFkZTQzMGNhNjdiNTJhNzgzMGFmNTZkZDNkZWFiMmI=
+  metadata.gz: 13a6df8872910aff61e248fd72a5bd2da01f217e7f7cf1a05a20d8bd96b93458d743233aea4cfa5315de4902f6b49b109c2be7c7a49bbf5ebfed4eba333964d4
+  data.tar.gz: 674a4bae04f183559d5b6137643e19e0d9742b84c5605037b6b7bb3dcb4425745bddd16a4d0e70d5aa5967532561770f1f5e922a655bcc3d2d553315d3bcc877

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.1.8)
+    blsm-vd-core (0.2.0)
 
 GEM
   remote: https://ruby.taobao.org/
@@ -115,6 +115,3 @@ DEPENDENCIES
   rails (~> 3.2)
   rake (~> 10.0)
   rspec (~> 3.2)
-
-BUNDLED WITH
-   1.10.3

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

@@ -0,0 +1,8 @@
+# coding: utf-8
+module BlsmVdCore
+  class Application < BlsmVdCore::BaseRecord
+    self.table_name='applications'
+    belongs_to :user, class_name: "::BlsmVdCore::User"
+    has_many :orders, class_name: "::BlsmVdCore::Order"
+  end
+end

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

@@ -5,7 +5,7 @@ module BlsmVdCore
     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'
@@ -13,6 +13,7 @@ module BlsmVdCore
       end
       0
     end
+
     #可能的（预计）收入
     def possible_profit
       if self.state=='CASH_BACK'
@@ -20,7 +21,8 @@ module BlsmVdCore
       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
@@ -31,7 +33,8 @@ module BlsmVdCore
       update_params[:rate_of_profit] = 1
       self.update_attributes(update_params)
     end
-  
+
+    #确认
     def marking_confirm(note)
       update_params = Hash.new
       update_params[:notes] = note

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

@@ -4,17 +4,26 @@ module BlsmVdCore
     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"
+
+    public
+    def pay_off_line?
+      self.pay_type == 1
+    end
+
+    def pay_on_line?
+      !(self.pay_off_line?)
+    end
 
-  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
+          unless item && item.franchise_price
             next
           end
-          jm_cost += item.quantity * (item.product_prop.franchise_price.to_f)
+          jm_cost += item.quantity * (item.franchise_price.to_f)
         end
       end
       sprintf('%0.2f', (self.total_fee - self.shipping_charge - jm_cost).to_f).to_f
@@ -35,12 +44,13 @@ module BlsmVdCore
     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'
@@ -59,14 +69,16 @@ module BlsmVdCore
         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

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

@@ -0,0 +1,30 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdInfoSec < BlsmVdCore::BaseRecord
+    self.table_name='vd_info_secs'
+    validates_uniqueness_of :transaction_no
+
+    #是否是危险操作，如此动作在信息安全库中可以查询到，
+    #说明此操作为危险动作，默认返回危险信息
+    #====Parameters
+    # * +vd_transaction+ - 交易描述
+    def self.dangerous?(vd_transaction)
+      vd_info_sec = VdInfoSec.where(transaction_no: Digest::MD5.hexdigest(vd_transaction)).first
+      if vd_info_sec
+        BlsmVdCore::ERROR_CODES[4010][:vd_info_sec]=vd_info_sec
+        return BlsmVdCore::ERROR_CODES[4010]
+      end
+      false
+    end
+
+    #录入安全信息
+    # #====Parameters
+    # * +vd_transaction+ - 交易描述
+    def self.committed(vd_transaction)
+      VdInfoSec.create({
+                           transaction_no: Digest::MD5.hexdigest(vd_transaction),
+                           description: vd_transaction
+                       })
+    end
+  end
+end

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

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

data/lib/blsm-vd-core.rb

@@ -14,93 +14,203 @@ 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/vd_info_sec'
 require 'blsm-vd-core/model/user'
+require 'blsm-vd-core/model/application'
 require 'faraday'
+
 module BlsmVdCore
+
+  #错误代码
+  ERROR_CODES = {
+      0 => {code: 0, msg: '什么都没发生'},
+
+      401 => {code: 401, msg: '没有权限'},
+      4010 => {code: 4010, msg: '安全校验未通过'},
+
+      404 => {code: 404, msg: '订单未找到'},
+      4042 => {code: 4042, msg: '结算项未找到'},
+      4043 => {code: 4043, msg: '空订单'},
+      4044 => {code: 4044, msg: '订单没有所属微店主'},
+      4045 => {code: 4045, msg: '用户不存在'},
+
+      200 => {code: 200, msg: '成功'}
+  }
   class << self
     attr_accessor :db_config
   end
+
   module_function
-  #订单状态发生变化
+
+  #当订单状态发生变化时，调用此方法
+  #==== Parameters
+  # * +order_id+  - 订单id
   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"
+    order = Order.where(id: order_id).first
+    clearing_item = ClearingItem.where(order_id: order.id).first if order
+
+    #数据校验
+    return ERROR_CODES[404] unless order
+    return ERROR_CODES[4042] unless clearing_item
+
+    #等待配货=>创建结算项
+    if order.state.to_s.include?('等待配货')
+      return create_clearing_item(order_id)
     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
+      order.clearing_items.each { |item|
+        item.destroy unless item.state == 'CASH_BACK'
+      } if order.clearing_items
+      return ERROR_CODES[200]
     end
+
+    #在线支付（客户签收，订单完成）=>确认结算项
+    if order.pay_on_line? && order.state=='客户签收，订单完成'
+      clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'})
+      return ERROR_CODES[200]
+    end
+
+    ERROR_CODES[0]
   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
+  #==== Parameters
+  # * +order_id+  - 订单id
+  # * +sign_type+  - 签收状态：ENUM('sign_ok','sign_fail')
+  def order_sign_handle(order_id, sign_type)
+    order = Order.where(id: order_id).first
+    clearing_item = ClearingItem.where(order_id: order.id).first if order
 
-    result = if sign_type == "sign_ok"
-      if clearing_item.pay_type == 'ZXZF'
-        puts "非货到付款订单,不需要做啥操作"
-        return "zxzf-not-need-handle"
-      end
+    #数据校验
+    return ERROR_CODES[404] unless order
+    return ERROR_CODES[4042] unless clearing_item
+    return ERROR_CODES[0] if sign_type =~ /sign_ok/ && clearing_item.state.to_s =~ /CASH_BACK/
+
+    #安全校验
+    vd_transaction = "order_sign_handle_#{order_id}_#{sign_type}"
+    danger = VdInfoSec.dangerous?(vd_transaction)
+    return danger if danger
+
+    #货到付款（物流返款成功，订单完成）
+    if sign_type =~ /sign_ok/ && order.pay_off_line?
       note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记物流返款')
       clearing_item.marking_confirm(note)
-    elsif sign_type == "sign_fail"
+      VdInfoSec.committed(vd_transaction)
+      return ERROR_CODES[200]
+    end
+
+    #签收失败（拒签）
+    if sign_type =~ /sign_fail/
+      VdInfoSec.committed(vd_transaction)
       if clearing_item.clearing && clearing_item.clearing.state == "BALANCED"
-        i_clearing = clearing_item.dup
+        i_clearing = clearing_item.clone
         i_clearing.clearing_id = nil
         i_clearing.save
         note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记签收失败')
         i_clearing.marking_refuse(note, clearing_item.possible_profit)
+        return ERROR_CODES[200]
       else
         note = Order.latest_notes(clearing_item, {username: '首趣'}, '标记签收失败')
         clearing_item.marking_refuse(note)
+        return ERROR_CODES[200]
       end
     end
-    sign_column = (sign_type == "sign_ok") ? "sign_ok" : "sign_fail"
-    if result
-      "sign-#{sign_column}-success"
-    else
-      "sign-#{sign_column}-error"
+
+    ERROR_CODES[0]
+  end
+
+  #创建(更新)结算项
+  #调用此方法，只会创建一个对应的结算项，如果之前有结算项，会直接更新相应的结算项
+  #==== Parameters
+  # * +order_id+  - 订单id
+  def create_clearing_item(order_id)
+    order = Order.where(id: order_id).first
+    line_items = order.line_items if order
+    user = order.application.user if order && order.application
+
+    #数据校验
+    return ERROR_CODES[404] unless order
+    return ERROR_CODES[4043] unless line_items && !line_items.empty?
+    return ERROR_CODES[4044] unless user
+
+    user_info = user.create_vd_user_info
+
+    #没有对应的结算项
+    if order.clearing_items.empty?
+      if order.state=='等待配货'
+        data = {}
+        data[:order_id] = order.id
+        data[:order_amount] = order.total_fee
+        data[:earn_amount] = order.jm_profit
+        data[:user_id] = user.id
+        data[:item_type] ='default'
+        data[:rate_of_profit] = user_info.profit_rate
+        data[:state] = 'WAIT_TO_SURE'
+
+        if order.pay_off_line?
+          data[:pay_type] = 'CODPAY'
+        else
+          data[:pay_type] = 'ZXZF'
+          data[:state] = 'CASH_BACK'
+          data[:real_amount] = order.total_fee
+        end
+        ClearingItem.new(data).save
+        return ERROR_CODES[200]
+      end
     end
+
+    #有对应的结算项（逐个去更新）
+    order.clearing_items.each { |item|
+      unless item.state == 'CASH_BACK'
+        data = {}
+        data[:order_id] = order.id
+        data[:order_amount] = order.total_fee
+        data[:earn_amount] = order.jm_profit
+        data[:rate_of_profit] = user_info.profit_rate
+        if order.pay_off_line?
+          data[:pay_type] = 'CODPAY'
+        else
+          data[:pay_type] = 'ZXZF'
+          data[:real_amount] = order.total_fee
+        end
+        item.update_attributes(data)
+        return ERROR_CODES[200]
+      end
+    }
+
+    ERROR_CODES[0]
+
   end
 
   #【积分获取】商品售卖出去
+  # 什么时候调用此方法合适？当订单的状态变更为‘已发货，准备收货’时，标明商品已经被售出
   #微店主的积分会根据商品总的供货价的
   #商品卖出，微店主会获取直接的 订单供货价 * +SCORES[:SALE_OUT_DIRECT]+ 积分
   #        微店主所属的队长（直接上级）获取 订单供货价 * +SCORES[:SALE_OUT_INDIRECT]+ 积分
   #==== Parameters
   # * +seller_id+  - 销售员的id
   # * +order_id+  - 订单id
-  def product_sale_out(seller_id, order_id)
+  def order_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
 
+    return ERROR_CODES[4045] unless seller
+    return ERROR_CODES[401] if !order || !order.application || !(order.application.user_id==seller_id)
+
+    #安全校验
+    vd_transaction = "order_sale_out_#{seller_id}_#{order_id}"
+    danger = VdInfoSec.dangerous?(vd_transaction)
+    return danger if danger
+
+    #卖家和团队领导的信息
     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 #供货价总和
+    #供货价总和
+    franchise_sum = order.franchise_sum
 
     #积分获取
     seller_info.update_attributes({:score => seller_info.score.to_f+franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_DIRECT]})
@@ -118,6 +228,15 @@ module BlsmVdCore
                            notes: "成员【#{seller.username}】分销#{franchise_sum}元,订单#{order_id}完成"
                        }) if leader_info
 
-    #TODO:销售额、分销额增加
+    #店主销售额、分销额增加
+    seller_info.update_attributes({:sale_sum => seller_info.sale_sum.to_f + order.total_fee.to_f})
+    seller_info.update_attributes({:distribute_sum => seller_info.distribute_sum.to_f + order.franchise_sum.to_f})
+
+    #安全库录入信息
+    VdInfoSec.committed(vd_transaction)
+
+    ERROR_CODES[200]
+
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - saxer
@@ -14,126 +14,126 @@ dependencies:
   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: 首趣微店核心模块,包含结算项的创建、更新、删除,微店主积分的更改等信息
@@ -143,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -157,6 +157,7 @@ files:
 - config/database.yml
 - lib/blsm-vd-core.rb
 - lib/blsm-vd-core/model/active_record.rb
+- 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/line_item.rb
@@ -164,6 +165,7 @@ files:
 - 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_info_sec.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
@@ -178,12 +180,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: []