blsm-vd-core 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b244c6be1d637b092eda8d78d28fc281de11de2
-  data.tar.gz: 2068c352a48048c956360c226a904b9a476b8a30
+  metadata.gz: 13344336d0479a112cfaa02f8805d282a88905c2
+  data.tar.gz: 17c2fb659700b6a1071b106f6071af4a91fadf83
 SHA512:
-  metadata.gz: 2af23a1b25bc42921546232427f0c51d6da1fb7a5a7fdf16d63dcc8f104ac3b557e3f69a2a18c9c4462dde999afdb048553cca018fa0e447f9d08adbb08a7ebf
-  data.tar.gz: 2f7343108c0d48dc69d6cf96ea4bf0ed637f370f5c5a565973ff6b46135e8dd73c6c6d5c4718a5cb3d4bedc9498265625ce9d38c5519e9a3e5a0cdb9b93efe1a
+  metadata.gz: 3b4b5be8c3f3d4101cac229bd5c1fd531df9344082cb39b8de80da990244d238ca9947ea53f5e9ea77aa2bee5d257294ac50c4d5fc837499ca6f8dcf4b033b7a
+  data.tar.gz: 8126fd350b189ef278b1662a7c62a401791252f439fdd5bab18ae883a3d3bfaaa187b625f83a54b867bdcdc7f3782d41184c382b8f8de51fc1c36e3ff64cca17

data/Gemfile.lock

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

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

@@ -6,6 +6,12 @@ module BlsmVdCore
     belongs_to :user, class_name: '::BlsmVdCore::User'
     belongs_to :supervisor, class_name: '::BlsmVdCore::User'
 
+    LEVELS = {
+        1 => '普通店主',
+        2 => '金牌店主',
+        3 => '钻石店主'
+    }
+
     #變化積分
     def change_score(changed_score)
       self.update_attributes({score: self.score+changed_score})
@@ -16,10 +22,25 @@ module BlsmVdCore
       self.vd_role == 'black'
     end
 
+    #店主等级
+    def level
+      return 3 if self.distribute_sum.to_f>=5000
+      return 2 if self.distribute_sum.to_f>=1500
+
+      golden_pay = VdWxPay.where(user_id: self.user_id,
+                                 return_code: 'SUCCESS',
+                                 result_code: 'SUCCESS',
+                                 vd_service_id: 1
+      ).first
+      return 2 if golden_pay
+      1
+    end
+
     #利润率，跟销售额有关系
     def profit_rate
-      return 0.5 if self.sale_sum.to_f<1500
-      return 0.7 if self.sale_sum.to_f<3000
+      return 1 if level>=2
+      return 0.5 if self.distribute_sum.to_f<750
+      return 0.7 if self.distribute_sum.to_f<1500
       1
     end
 

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

@@ -0,0 +1,7 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdWxPay < BlsmVdCore::BaseRecord
+    self.table_name = 'vd_wx_pays'
+    belongs_to :user, class_name: '::BlsmVdCore::User'
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -182,6 +182,7 @@ files:
 - 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/model/vd_wx_pay.rb
 - lib/blsm-vd-core/version.rb
 homepage: https://bitbucket.org/Xiaopuzhu/blsm-vd-core
 licenses: