blsm-vd-core 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cfbe74a9b2aae00ab57d96ad09e061fbd97b5b7
-  data.tar.gz: f12f5e6d61cbb865c8770740870e2d61af15c47d
+  metadata.gz: 88eb769d8f1f8b766c331a5262a921eae496eca0
+  data.tar.gz: cd122a4b340b889ce0b461ebda72032d3d76f714
 SHA512:
-  metadata.gz: a38942e555d4a3570a076a70b75fa20c7153285d3c0587c3d2f15b231aa3574c0a4dc6bd97da69c30f614040d5bd778f989bda3c9395037e9e34d90c1dd27a05
-  data.tar.gz: f98d6419af754ff7c6a4ea759d511955b1e826724e929951965b6695f8f9a120abb041eec43baa6c2464c7be1cca83934a9d30b93faba6f46bd710beea337860
+  metadata.gz: 518848866205b77e4df608314fce2ebf0f83a77584e0a731a163977c4acb5f3a4d0022f8aee9101c9d69d032b94ed73b14b212a9aad5e8e63a23d92d6ec0e0f7
+  data.tar.gz: 6bde110e953670e59fb30f0340e4feb392d135d73005e985de5c14257053e7def01aee1c1132bb6848b8018518189acd8cda7803454f1666f45823522d6fd151

data/Gemfile.lock

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

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

@@ -27,8 +27,12 @@ module BlsmVdCore
       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
+      if self.order.toggle_delivery_deposit && self.order.pay_type.to_i==1
+        update_params[:real_amount] = self.order.payment_total.to_f+self.express_service_fee - (self.earn_amount - self.order_amount + self.order.real_shipping_charge * 2) - reduce_real_amount
+      else
+        update_params[:real_amount] = self.express_service_fee - (self.earn_amount - self.order_amount + self.order.real_shipping_charge * 2) - reduce_real_amount
+      end
+
       update_params.delete(:real_amount) if self.possible_profit < 0.0
       update_params[:rate_of_profit] = 1
       self.update_attributes(update_params)
@@ -40,7 +44,7 @@ module BlsmVdCore
       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
+      update_params[:real_amount] = ((self.order.toggle_delivery_deposit && self.order.pay_type.to_i==1) ? (self.order.actual_total.to_f+self.order.payment_total.to_f) : self.order.actual_total)
       self.update_attributes(update_params)
     end
   end

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

@@ -24,6 +24,11 @@ module BlsmVdCore
       sprintf('%0.2f', fee.to_f).to_f
     end
 
+    #到付押金开关状态
+    def toggle_delivery_deposit
+      (self.toggle_setting.to_i & 0b00000001) == 1
+    end
+
     #是否是自动售货机的订单
     def ubox_order?
       self.ubox_vm

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

data/lib/blsm-vd-core.rb

@@ -88,9 +88,13 @@ module BlsmVdCore
             VdRcMsgNotify.create_order_finish_notify(user.username)
           end
           # 给邀请人
-          inviter = User.where(:invication_code=>user.invicated_from).first
+          inviter = User.where(:invication_code=>user.invicated_from).first if user.invicated_from
           vd_transaction = "inviter_#{order.id}_reward"
           if user.create_vd_user_info.channel == "market_invite" && !inviter.blank? && !BlsmVdCore::VdInfoSec.dangerous?(vd_transaction)
+
+            #发送给邀请人微信提醒
+            content = "您邀请的店主 #{user.username}（注册电话号为#{user.phone}）与#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}成功成交一笔订单，订单金额为#{order.total_fee.to_f}元， 您将同步获取邀请奖励#{(order.total_fee.to_f * 0.1).round(2)}元，特此通知"
+
             #为邀请人创建,结算项
             ClearingItem.create({
                                     state: 'CASH_BACK',
@@ -100,8 +104,6 @@ module BlsmVdCore
                                     rate_of_profit: 1,
                                     earn_amount: (order.total_fee.to_f * 0.1).round(2)
                                 })
-            #发送给邀请人微信提醒
-            content = "您邀请的店主 #{user.username}（注册电话号为#{user.phone}）与#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}成功成交一笔订单，订单金额为#{order.total_fee.to_f}元， 您将同步获取邀请奖励#{(order.total_fee.to_f * 0.1).round(2)}元，特此通知"
             VdMpMsg.create!({
                                 app_id: BlsmMpWx.APP_ID,
                                 openid: inviter.openid,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec