blsm-vd-core 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b57b906e7e5353bf1462b2ef2837017a0646b34f
-  data.tar.gz: b615efb55cc6ef16946ad27a18e29993019504fc
+  metadata.gz: 6f5feb33241ef874a85488ea7ec2d67c8a7e2704
+  data.tar.gz: 6b0d5e344b2e65a9c9a4d8f89f8e6b2fbb72d58c
 SHA512:
-  metadata.gz: c1110f0ac05fe5a53d7c00d860583d282f7ab046cb04d374b2ef21f631cafc1e326e8ac2b13633eccbe55ee4d99ae60a1c536d6f2776b0da94a678552bf80272
-  data.tar.gz: 8cbb151b80a35bda57af73e6891d1269ecc1a691714d8afbf601690df7a5f006d8318004a896227c98d3a2eac3437b7355c75d0aba1c921b9ae380d90f079e14
+  metadata.gz: 257d2c9a42a40df19505c60bda1468b2b4204d5b904ce08fc6018312bb01fe7cad73c30070e61d922cb1362d3556885d81221616f8c99ea2885201b55940d868
+  data.tar.gz: 3c50df573079b090d043d03200ea23584593fad6967cd51aa3b8bf9cada94f8a482008c436b114b9e2008a3ef6a67e3aaaf1cb58c77060b5f2d3ebec1de1008f

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

@@ -19,7 +19,7 @@ module BlsmVdCore
         rate = VdUserScore::SCORES[:SALE_OUT_INDIRECT] if rate.nil? && "black" == role
         fee += ((item.quantity * item.franchise_price.to_f) * rate)
       end
-      fee
+      sprintf('%0.2f', fee.to_f).to_f
     end    
     def pay_off_line?
       self.pay_type == 1

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.3.5"
+  VERSION = "0.3.7"
 end

data/lib/blsm-vd-core.rb

@@ -173,11 +173,11 @@ module BlsmVdCore
         leader_info = leader.create_vd_user_info if leader
 
         #订单确认提醒（黑带）
-        leader_change = order.franchise_sum.to_f*VdUserScore::SCORES[:SALE_OUT_INDIRECT]
+        leader_change = order.get_vd_score(leader_info.vd_role)
         distribute_leader_notify = {touser: leader.openid,
                                     order_id: Order.encrypt(Order.encrypted_id_key, order.id.to_s),
                                     score_change: leader_change,
-                                    money_change: leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY],
+                                    money_change: (leader_change*VdUserScore::SCORES[:SCORE_TO_MONEY]).round(2),
                                     content: "首趣黑带#{leader.username}，你好：成员【#{user.username}】确认订单成功。"
         } if leader && leader_info
         BlsmMpWx.create_msg(nil, leader.openid, distribute_leader_notify, 'distribute') if distribute_leader_notify
@@ -300,7 +300,8 @@ module BlsmVdCore
     }
 
     #安全校验(是否曾经被售出过)
-    sold_out = VdInfoSec.dangerous?("order_sale_out_#{seller_id}_#{order_id}")
+    score_type_str = "order_sale_out_#{seller_id}_#{order_id}"
+    sold_out = VdInfoSec.dangerous?(score_type_str)
     return ERROR_CODES[200] unless sold_out
 
     #安全校验(是否曾经此订单被取消，并且扣取积分)
@@ -313,8 +314,8 @@ module BlsmVdCore
 
     #供货价总和、应该扣取的积分总额
     franchise_sum = order.franchise_sum
-    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: sold_out) if leader && leader_info
-    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: sold_out).first.score
+    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
+    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
     leader_change = -leader_order_score.score if leader_order_score
 
     #扣取积分
@@ -361,7 +362,8 @@ module BlsmVdCore
     return ERROR_CODES[401] if !order || !order.application || !(order.application.user_id==seller_id)
 
     #安全校验(是否曾经被售出过)
-    sold_out = VdInfoSec.dangerous?("order_sale_out_#{seller_id}_#{order_id}")
+    score_type_str = "order_sale_out_#{seller_id}_#{order_id}"
+    sold_out = VdInfoSec.dangerous?(score_type_str)
     return ERROR_CODES[200] unless sold_out
 
     #安全校验(是否曾经此订单被取消，并且扣取积分)
@@ -374,8 +376,8 @@ module BlsmVdCore
 
     #供货价总和、应该扣取的积分总额
     franchise_sum = order.franchise_sum
-    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: sold_out) if leader && leader_info
-    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: sold_out).first.score
+    leader_order_score = VdUserScore.where(user_id: leader.id).where(score_type: score_type_str).first if leader && leader_info
+    seller_change = -VdUserScore.where(user_id: seller.id).where(score_type: score_type_str).first.score
     leader_change = -leader_order_score.score if leader_order_score
 
     #扣取积分

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - saxer