blsm-vd-core 0.5.7 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a619cbb1c9137fb89506bd0c01b4589cacbe5e85
-  data.tar.gz: f5291a8daffd8237e733b7bc38eedb420951fcfa
+  metadata.gz: 3bc23518d04fe5711185d9ff221296bad389975b
+  data.tar.gz: 84e2e49660d867b1e9892478978f6cf71e4631bb
 SHA512:
-  metadata.gz: ce704d669799549cf738e93b7e01c86b2f8c9e6f561bfef3b22512b277e116ad660baa205ef23105f249eaefaca622095193f3cc2fba5aef1ba462cc014f5992
-  data.tar.gz: 26b418492e4c805a5e31cf21b97059040405a964a021bf07b87815f88263f52bb1201966afa8e2d8cc42020c6c8b3713011fbf5ceb448b1fcb9201e1f18daf05
+  metadata.gz: 1df46731003a908d359f2f9d7f9c010bd7ad6ece943a417e8bbb0ee9df4a542564c33e9acb6c454220d4294a198536c627dbe4063f66864eb8c799aecda724a7
+  data.tar.gz: b66f2605df6c74fe3ce56519e231061c324f08718a5b52468743fecbc89028299f74644c53e4922e65ff1a1a0fe00c688d595b7044656693d8a9aaac4f741a2a

data/.gitignore

@@ -8,4 +8,4 @@
 /tmp/
 /.idea/
 *.gem
-/pkg/
+/config/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blsm-vd-core (0.5.6)
+    blsm-vd-core (0.6.1)
 
 GEM
   remote: https://ruby.taobao.org/

data/lib/blsm-vd-core.rb

@@ -62,10 +62,6 @@ module BlsmVdCore
       return create_clearing_item(order_id)
     end
 
-    #已发货，准备收货=>订单被售卖出去
-    # if order.state.to_s.include?('已发货，准备收货')
-    #   return on_order_sale_out(order.application.user_id, order_id) if order.application
-    # end
 
     #订单被取消=>删除结算项(扣除積分)
     if order.state.to_s.include?('订单取消')
@@ -74,6 +70,9 @@ module BlsmVdCore
 
     #在线支付（客户签收，订单完成）=>确认结算项
     if order.state.to_s.include?('客户签收，订单完成')
+      create_clearing_item(order_id) if order.ubox_order?
+      clearing_item = ClearingItem.where(order_id: order.id).first if order.ubox_order?
+
       on_order_sale_out(order.application.user_id, order_id) if order.application
       clearing_item.update_attributes({earn_amount: order.jm_profit, state: 'CASH_BACK'}) if clearing_item && order.pay_on_line?
       return ERROR_CODES[200]
@@ -169,21 +168,21 @@ module BlsmVdCore
 
     #没有对应的结算项
     if order.clearing_items.empty?
-      if order.state=='等待配货' || force
+      #线上订单(等待配货时创建结算项) 线下订单(客户签收时创建结算项)
+      if (!order.ubox_order? && order.state=='等待配货') || (order.ubox_order? && order.state=='客户签收，订单完成') || force
         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[:rate_of_profit] = order.ubox_order? ? 0.25 : 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
 
@@ -201,7 +200,7 @@ module BlsmVdCore
                                     score_change: leader_change,
                                     money_change: (leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY]).round(2),
                                     content: "首趣黑带#{leader.username}，你好：你的队员【#{user.username}】已成功确认订单，"
-        } if leader && leader_info
+        } if leader && leader_info && !order.ubox_order?
         BlsmMpWx.create_msg(nil, leader.openid, distribute_leader_notify, 'distribute') if distribute_leader_notify
 
         return ERROR_CODES[200]
@@ -215,7 +214,7 @@ module BlsmVdCore
         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
+        data[:rate_of_profit] = order.ubox_order? ? 0.25 : user_info.profit_rate
         if order.pay_off_line?
           data[:pay_type] = 'CODPAY'
         else
@@ -281,20 +280,22 @@ module BlsmVdCore
     end
 
     # 卖家信息变动
-    seller_info.change_score(seller_change) unless seller_change==0
+    if seller_change!=0 && !order.ubox_order?
+      seller_info.change_score(seller_change)
+
+      seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "您好，订单#{order.number}已成功签收，分销#{franchise_sum}元"}
+      BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
+    end
 
-    seller_notify = {touser: seller.openid, change: seller_change, total: seller_info.score, content: "您好，订单#{order.number}已成功签收，分销#{franchise_sum}元"}
-    BlsmMpWx.create_msg(nil, seller.openid, seller_notify, 'score_change')
     VdUserScore.create({
                            user_id: seller_id,
                            score: seller_change,
-                           notes: "订单#{order.number}已成功签收，分销#{franchise_sum}元",
+                           notes: "订单#{order.number}已#{order.ubox_order? ? '出货成功' : '成功签收'}，分销#{franchise_sum}元",
                            score_type: vd_transaction
                        })
-    # end
 
     #黑带信息变动
-    if leader && leader_info && leader_change && leader_change!=0
+    if leader && leader_info && leader_change && leader_change!=0 && !order.ubox_order?
 
       leader_info.change_score(leader_change)
       leader_notify = {touser: leader.openid, change: leader_change, total: leader_info.score, content: "首趣黑带#{leader.username}，你好，你的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元"}
@@ -308,7 +309,7 @@ module BlsmVdCore
     end
 
     #原始黑带信息变动
-    if org_leader && org_leader_info && org_leader_change && org_leader_change!=0
+    if org_leader && org_leader_info && org_leader_change && org_leader_change!=0 && !order.ubox_order?
       org_leader_info.change_score(org_leader_change)
 
       org_leader_notify = {touser: org_leader.openid, change: org_leader_change, total: org_leader_info.score,
@@ -326,6 +327,9 @@ module BlsmVdCore
     VdUserInfo.update_counters(seller_info.id, :distribute_sum => order.franchise_sum.to_f)
     VdUserInfo.find_by_id(seller_info.id) { |info| info.sync_shop_state }
 
+    #分销额增加,更新未发出货物的(state=CREATE)分成比率
+    seller.clearing_items.where(:state => "WAIT_TO_SURE").update_all(:rate_of_profit => seller_info.profit_rate)
+
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
 
@@ -374,7 +378,7 @@ module BlsmVdCore
 
     VdUserScore.where(score_type: score_type_str).each do |score|
       score_change = -score.score
-      if score.user
+      if score.user && !order.ubox_order?
         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}取消"}
         BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
@@ -418,7 +422,7 @@ module BlsmVdCore
 
     VdUserScore.where(score_type: score_type_str).each do |score|
       score_change = -score.score
-      if score.user
+      if score.user && !order.ubox_order?
         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}拒签"}
         BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')

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

@@ -20,7 +20,13 @@ module BlsmVdCore
         fee += ((item.quantity * item.franchise_price.to_f) * rate)
       end
       sprintf('%0.2f', fee.to_f).to_f
-    end    
+    end
+
+    #是否是自动售货机的订单
+    def ubox_order?
+      !self.ubox_vmid.nil?
+    end
+
     def pay_off_line?
       self.pay_type == 1
     end
@@ -44,7 +50,7 @@ module BlsmVdCore
           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
+      ubox_order? ? sprintf('%0.2f', self.total_fee).to_f : sprintf('%0.2f', (self.total_fee - self.shipping_charge - jm_cost).to_f).to_f
     end
 
     #总的加盟费（供货价）

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.5.7"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.2
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec