blsm-vd-core 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637e1d6b0eccffe21fa182edc0250f9a829f454e
-  data.tar.gz: b1f87de8ca89da90f189f4299c353c6c26bbeddd
+  metadata.gz: d900f262f49e3f750e6e1282ba46eae80e3a2e8c
+  data.tar.gz: 457b226937b09497e4700586b591f779ebaf8adf
 SHA512:
-  metadata.gz: 054204a8cdee4b1fd961298b33cf6477e4dbe160a687d064817bdff1b402690e5c2527b9cf41fb17eeefaf0e8931a8247df0d8a08725cc19947caa8ad62be159
-  data.tar.gz: cd933a9502beb99bd85565b61aea20e439bce982dc0b66987e5e1b066e2d1a9a26b53236ef73c342b4f267672c544f54f386934828af94f434451178b2e1f7fc
+  metadata.gz: a8eeca634abbb9c5745888b419ce0fa1f0a1c32914626c46e31e49ebf7dae37f0a54662911e81b23ca3d333afdec03aa9ad197bfcb32bfc3ae441b861f8097d4
+  data.tar.gz: eb42d8cf00896b68a771f955c450773513dccf549f66cef609d2e0a0123df8384c7c67d98cd6e68fca13d3b3e7078c238750324ec657d3afa96008b2d7e4a956

data/Gemfile.lock

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

data/lib/blsm-vd-core.rb

@@ -22,6 +22,9 @@ require 'blsm-vd-core/model/vd_rc_msg_notify'
 require 'blsm-vd-core/model/rc_user'
 require 'blsm-vd-core/model/user'
 require 'blsm-vd-core/model/application'
+require 'blsm-vd-core/model/setting'
+require 'blsm-vd-core/model/recharge_spread'
+require 'blsm-vd-core/model/user_spread'
 require 'faraday'
 require 'blsm-mp-wx'
 
@@ -332,7 +335,9 @@ module BlsmVdCore
 
       #融云推送
       if leader.rc_user
-        VdRcMsgNotify.create_score_change_notify(leader.id, "首趣黑带#{leader.username}，你好，你的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元", leader_change, '积分', leader_info.score)
+        VdRcMsgNotify.create_score_change_notify(leader.id,
+                                                 "首趣黑带#{leader.username}，你好，你的队员【#{seller.username}】订单#{order.number}已成功签收，分销#{franchise_sum}元",
+                                                 leader_change, '积分', leader_info.score)
       end
 
       #微信通知
@@ -391,6 +396,28 @@ module BlsmVdCore
       end
     end
 
+    #订单签收,加粉充值自动增加10元
+    fans_rewards = Setting.vd_order_sign_fans_rewards
+    if fans_rewards && fans_rewards[:order_money]>0 && fans_rewards[:reward_money]>0 && (order.shipping_charge+order.item_total)>= fans_rewards[:order_money]
+
+      user_spread = UserSpread.where(user_id: seller.id).first
+      if user_spread
+        UserSpread.update_counters(user_spread.id, :amount => fans_rewards[:reward_money])
+        RechargeSpread.create({amount: fans_rewards[:reward_money], user_spread_id: user_spread.id, r_type: 1, admin_id: 3, notes: "订单#{order.id}签收奖励"})
+
+        puts "seller:#{seller},rc_user:#{seller.rc_user}"
+
+        #融云推送
+        if seller.rc_user
+          VdRcMsgNotify.create_order_sign_fans_notify(seller.id,
+                                                      fans_rewards[:reward_money],
+                                                      order.number,
+                                                      "尊敬的店主#{seller.username}，您好，您的订单#{order.number}已成功签收，首趣奖励您粉丝推广费#{fans_rewards[:reward_money]}元")
+        end
+      end
+
+    end
+
     #安全库录入信息
     VdInfoSec.committed(vd_transaction)
 

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

@@ -0,0 +1,6 @@
+# coding: utf-8
+module BlsmVdCore
+  class RechargeSpread < BlsmVdCore::BaseRecord
+    self.table_name = 'recharge_spreads'
+  end
+end

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

@@ -0,0 +1,15 @@
+# coding: utf-8
+module BlsmVdCore
+  class Setting < BlsmVdCore::BaseRecord
+    self.table_name='settings'
+
+
+    #订单签收,奖励加粉金额
+    def self.vd_order_sign_fans_rewards
+      setting = Setting.where(name: 'vd_order_sign_fans_reward').pluck(:value)[0]
+      return nil unless setting
+      array = setting.split('|')
+      {order_money: array[0].to_i, reward_money: array[1].to_i}
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+# coding: utf-8
+module BlsmVdCore
+  class UserSpread < BlsmVdCore::BaseRecord
+    self.table_name='user_spreads'
+
+  end
+end

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

@@ -39,7 +39,7 @@ module BlsmVdCore
                                                    "客户信息:#{order.ubox_order? ? "售货机#{order.ubox_vmid}扫码用户" : "#{order.shipping_province} #{order.name} #{order.phone}"}",
                                                    "买家留言:#{order.comment}"
                                                ],
-                                               url: "http://wunion.4007060700.com/mobile/jms_orders/#{order.to_param}"
+                                               url: "http://m.shouqu360.com/mobile/jms_orders/#{order.to_param}"
                                            }.to_json
                                        })
 
@@ -70,7 +70,7 @@ module BlsmVdCore
                                                    "客户信息:#{order.ubox_order? ? "售货机#{order.ubox_vmid}扫码用户" : "#{order.shipping_province} #{order.name} #{order.phone}"}",
                                                    "买家留言:#{order.comment}"
                                                ],
-                                               url: "http://wunion.4007060700.com/mobile/jms_orders/#{order.to_param}"
+                                               url: "http://m.shouqu360.com/mobile/jms_orders/#{order.to_param}"
                                            }.to_json
                                        })
 
@@ -101,7 +101,7 @@ module BlsmVdCore
                                                    "预收积分:#{score}",
                                                    "备注:订单签收后您会获取相应积分"
                                                ],
-                                               url: "http://wunion.4007060700.com/mobile/jms_orders/#{order.to_param}/only_show"
+                                               url: "http://m.shouqu360.com/mobile/jms_orders/#{order.to_param}/only_show"
                                            }.to_json
                                        })
 
@@ -132,7 +132,7 @@ module BlsmVdCore
                                                    "订单金额:#{order.total_fee}",
                                                    "预计收入:#{order.jm_profit}元"
                                                ],
-                                               url: "http://wunion.4007060700.com/mobile/jms_orders/#{order.to_param}/only_show?change=√"
+                                               url: "http://m.shouqu360.com/mobile/jms_orders/#{order.to_param}/only_show?change=√"
                                            }.to_json
                                        })
 
@@ -144,7 +144,7 @@ module BlsmVdCore
     #  msg_content['change'] 结算金额
     #  msg_content['account_type'] 账户类型
     #  msg_content['total']  账户总余额
-    def self.create_account_change_notify(user_id, body, money, account_type, total, url='http://wunion.4007060700.com/mobile/my_clearings')
+    def self.create_account_change_notify(user_id, body, money, account_type, total, url='http://m.shouqu360.com/mobile/my_clearings')
       user = BlsmVdCore::User.where(id: user_id).first
       return nil unless user && user.rc_user
 
@@ -177,7 +177,7 @@ module BlsmVdCore
     #  msg_content['change'] 结算金额
     #  msg_content['account_type'] 账户类型
     #  msg_content['total']  账户总余额
-    def self.create_score_change_notify(user_id, body, change, account_type, total, url='http://wunion.4007060700.com/mobile/my_scores')
+    def self.create_score_change_notify(user_id, body, change, account_type, total, url='http://m.shouqu360.com/mobile/my_scores')
       user = BlsmVdCore::User.where(id: user_id).first
       return nil unless user && user.rc_user
 
@@ -226,7 +226,34 @@ module BlsmVdCore
                                                    "积分变动:#{score_change}",
                                                    "积分余额:#{user.create_vd_user_info.score}"
                                                ],
-                                               url: 'http://wunion.4007060700.com/mobile/jms_orders'
+                                               url: 'http://m.shouqu360.com/mobile/jms_orders'
+                                           }.to_json
+                                       })
+
+    end
+
+
+    #创建订单签收、积分加粉充值
+    def self.create_order_sign_fans_notify(user_id, reward_money, order_number, body)
+      user = BlsmVdCore::User.where(id: user_id).first
+      return nil unless user && user.rc_user
+
+      BlsmVdCore::VdRcMsgNotify.create({
+                                           user_id: 3,
+                                           to_ids: user.username,
+                                           to_type: 'single',
+                                           msg_type: 'CU:TemplateMsg',
+                                           title: '订单签收-粉丝推广奖励',
+                                           content: {
+                                               title: '订单签收-粉丝推广奖励',
+                                               content: {
+                                                   body: body
+                                               },
+                                               items: [
+                                                   "订单编号:#{order_number}",
+                                                   "奖励金额:#{reward_money}"
+                                               ],
+                                               url: 'http://m.shouqu360.com/mobile/user_spreads'
                                            }.to_json
                                        })
 

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -193,8 +193,11 @@ files:
 - lib/blsm-vd-core/model/product.rb
 - lib/blsm-vd-core/model/product_prop.rb
 - lib/blsm-vd-core/model/rc_user.rb
+- lib/blsm-vd-core/model/recharge_spread.rb
+- lib/blsm-vd-core/model/setting.rb
 - 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_info_sec.rb
 - lib/blsm-vd-core/model/vd_rc_msg_notify.rb
 - lib/blsm-vd-core/model/vd_user_info.rb