blsm-vd-core 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7418901e98965d96d06917fc0791c9b568936b33
-  data.tar.gz: bf33a84b4e5466e64c71206020b6bcd80305e442
+  metadata.gz: 96a09005b55e480864d0ccd8d14b34ee09fabe7d
+  data.tar.gz: 58369f32ba270c58accab9ffcf77e0577eb6328f
 SHA512:
-  metadata.gz: 0fbe8d8b8fdd3f6582c84e92143294a9b03541de02d8579d645538e611600ee9c3893dd98a8b74ec132a3e83f563c10db60a23d3ce45767c73fe9287a1e1642b
-  data.tar.gz: 17ccc1b148c6456bb1dad36b330b1180ee7396c7aca281465710b395b782684e633cdba00916b7ca2755e1ab17cb8a29fe5258360f00f2a56306cb32ef639346
+  metadata.gz: 79a11de11b20e13fc1e6db9aab3cd49d8b7a00d165f69acd6497405647985f18431064a4842104684aae546dfe9bbd1cd06fec9ef42cd3f404cb20b29a5b6330
+  data.tar.gz: bcb618402d988a7bf116b798844877b03f0b059001538824f36f353f5f2f4607d7e84e1168b0702b29f820a4a161a3f00ea6e1f22bb7806dbce32e85d9e873c8

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

@@ -8,6 +8,7 @@ module BlsmVdCore
     belongs_to :application, class_name: "::BlsmVdCore::Application", foreign_key: "application_id"
     belongs_to :shippingorder, class_name: "::BlsmVdCore::Shippingorder", foreign_key: "shippingorder_id"
     belongs_to :ubox_vm, class_name: "::BlsmVdCore::UboxVm", foreign_key: 'ubox_vmid', primary_key: 'ubox_vmid'
+    has_one :vd_free_post,class_name:  "::BlsmVdCore::VdFreePost"
 
     encrypted_id key: 'bYqILlFMZn3xd8Cy'
 

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

@@ -0,0 +1,25 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdFreePost < BlsmVdCore::BaseRecord
+    self.table_name='vd_free_posts'
+    belongs_to :user, class_name: "::BlsmVdCore::User"
+    belongs_to :order, class_name: "::BlsmVdCore::Order"
+
+    DEFAULT_EXPIRE_AT = '2017-01-20 15:30'
+
+    before_validation :gen_expire_at
+
+    def expired?
+      return false unless self.expire_at
+      return true if Time.now.strftime('%Y-%m-%d %H:%M:%S')> self.expire_at.strftime('%Y-%m-%d %H:%M:%S')
+      false
+    end
+
+    private
+    def gen_expire_at
+      unless self.expire_at
+        self.expire_at = VdFreePost::DEFAULT_EXPIRE_AT
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/lib/blsm-vd-core.rb

@@ -27,6 +27,7 @@ require 'blsm-vd-core/model/setting'
 require 'blsm-vd-core/model/recharge_spread'
 require 'blsm-vd-core/model/user_spread'
 require 'blsm-vd-core/model/shippingorder'
+require 'blsm-vd-core/model/vd_free_post'
 require 'faraday'
 require 'blsm-mp-wx'
 
@@ -44,6 +45,9 @@ module BlsmVdCore
       4043 => {code: 4043, msg: '空订单'},
       4044 => {code: 4044, msg: '订单没有所属微店主'},
       4045 => {code: 4045, msg: '用户不存在'},
+      4046 => {code: 4046, msg: 'setting值不存在'},
+      4047 => {code: 4047, msg: 'setting规则不匹配'},
+      4048 => {code: 4048, msg: 'setting值为空'},
 
       200 => {code: 200, msg: '成功'}
   }
@@ -78,12 +82,12 @@ module BlsmVdCore
 
     #订单被拒签=>创建shippingorder 拒签的记录
     if order.state.to_s.include?('客户拒签，原件返回')
-      shippingorder = Shippingorder.where(:id=>order.shippingorder_id).first
+      shippingorder = Shippingorder.where(:id => order.shippingorder_id).first
       if shippingorder.blank?
-        shippingorder = Shippingorder.create(:refuse_at=>Time.now)
-        order.update_attributes(:shippingorder_id=>shippingorder.id)
+        shippingorder = Shippingorder.create(:refuse_at => Time.now)
+        order.update_attributes(:shippingorder_id => shippingorder.id)
       else
-        shippingorder.update_attributes(:refuse_at=>Time.now)
+        shippingorder.update_attributes(:refuse_at => Time.now)
       end
       return
     end
@@ -95,16 +99,28 @@ module BlsmVdCore
       if order.application
         on_order_sale_out(order.application.user_id, order_id)
         #订单完成, 发送融云消息, 给邀请人奖励
-        user =  order.application.user
+        user = order.application.user
         if !user.blank?
           #订单完成, 发送融云消息
           if !user.rc_user.blank?
             VdRcMsgNotify.create_order_finish_notify(user.username)
           end
+          # 包邮券返款
+          if order.vd_free_post
+            ClearingItem.create({
+                                    state: 'CASH_BACK',
+                                    pay_type: "ZXZF",
+                                    user_id: user.id,
+                                    order_id: -14,
+                                    rate_of_profit: 1,
+                                    earn_amount: order.shipping_charge
+                                })
+          end
+
           # 进货费返还
           user_info = user.create_vd_user_info
           if !order.line_items.blank? && user_info.purchase_fee > 0
-            franchise_price = order.line_items.inject(0){|result,item| result+item.franchise_price*item.quantity}
+            franchise_price = order.line_items.inject(0) { |result, item| result+item.franchise_price*item.quantity }
             earn_amount = franchise_price < user_info.purchase_fee ? franchise_price : user_info.purchase_fee
             #创建结算项
             ClearingItem.create({
@@ -115,10 +131,10 @@ module BlsmVdCore
                                     rate_of_profit: 1,
                                     earn_amount: earn_amount
                                 })
-            user_info.update_attributes(:purchase_fee=> (user_info.purchase_fee - earn_amount))
+            user_info.update_attributes(:purchase_fee => (user_info.purchase_fee - earn_amount))
           end
           # 给邀请人奖励
-          inviter = User.where(:invication_code=>user.invicated_from).first if user.invicated_from
+          inviter = User.where(:invication_code => user.invicated_from).first if user.invicated_from
           vd_transaction = "inviter_#{order.id}_reward"
           #被邀请人,金牌店主以下,渠道邀请,邀请人不为空,一个订单只能有一个结算项
           if user.vd_user_info.distribute_sum < 1500 && user.create_vd_user_info.channel == "market_invite" && !inviter.blank? && !BlsmVdCore::VdInfoSec.dangerous?(vd_transaction)
@@ -154,7 +170,7 @@ module BlsmVdCore
                                        content: content
                                    })
             end
-            BlsmVdCore::VdInfoSec.committed(vd_transaction)   #防止重复创建
+            BlsmVdCore::VdInfoSec.committed(vd_transaction) #防止重复创建
           end
         end
       end
@@ -186,6 +202,44 @@ module BlsmVdCore
     ERROR_CODES[200]
   end
 
+
+  #订单被导入到erp时
+  # 判断订单是否包含顺丰包邮商品，并根据此创建包邮券
+  def on_order_export_to_erp(order_id)
+    order = Order.where(id: order_id).first
+    settings = Setting.where(name: 'vd_free_post_products').first
+    seller = order.application.user if order && order.application
+
+    #数据校验
+    return ERROR_CODES[404] unless order
+    return ERROR_CODES[4043] unless order.line_items
+    return ERROR_CODES[4046] unless settings
+    return ERROR_CODES[4045] unless seller
+
+    product_ids = settings.value.to_s.split('|').map(&:to_i)
+
+    return ERROR_CODES[4048] if product_ids.size==0
+    return ERROR_CODES[4047] unless order.line_items.detect { |item| product_ids.include?(item.product_id) }
+
+    #安全校验
+    vd_transaction = "order_export_to_erp_handle_#{order_id}"
+    danger = VdInfoSec.dangerous?(vd_transaction)
+    return danger if danger
+    VdFreePost.create({user_id: seller.id})
+    content = '您获取到一张顺丰免费券，点击查看 http://w.url.cn/s/AQsuRun'
+    VdMpMsg.create!({
+                        app_id: BlsmMpWx.APP_ID,
+                        openid: seller.openid,
+                        content: content,
+                        msg_name: "custom",
+                        template_msg: false,
+                        status: 'none'
+                    }) if seller.openid
+
+    VdInfoSec.committed(vd_transaction)
+    ERROR_CODES[200]
+  end
+
   #物流返款
   #==== Parameters
   # * +order_id+  - 订单id
@@ -461,7 +515,6 @@ module BlsmVdCore
     #店主销售额、分销额增加
     VdUserInfo.update_counters(seller_info.id, :sale_sum => order.total_fee.to_f)
     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").each do |item|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -199,6 +199,7 @@ files:
 - lib/blsm-vd-core/model/ubox_vm.rb
 - lib/blsm-vd-core/model/user.rb
 - lib/blsm-vd-core/model/user_spread.rb
+- lib/blsm-vd-core/model/vd_free_post.rb
 - lib/blsm-vd-core/model/vd_info_sec.rb
 - lib/blsm-vd-core/model/vd_mp_msg.rb
 - lib/blsm-vd-core/model/vd_rc_msg_notify.rb