blsm-vd-core 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad693fd9d47f9e810039d67e597981dfcb0234c1
-  data.tar.gz: ae0e966c7efbd5e712d47dfaeef7a520906d5a24
+  metadata.gz: 240d6c8e38c044bf1aad23991ab7ee642677db58
+  data.tar.gz: 6b7436ba1dbcbc3c4de9f5c551bd02c350cebe94
 SHA512:
-  metadata.gz: 96d6faf48800aa549ad251161c81547a01dbccee1e75debed813a8c7a243c05412bc2f62b37a8dc3bc4b936555daf817428a5ea1cb9e742096e9c4aac3940246
-  data.tar.gz: 016d63046ab6d9178755913fc0e3fcbd42f162af321eea76f7df6deb7d2288000d0d6942431d0fbf0a7698407458ad8a0b21c66b1b4cffcdb500a5b1bd3f2f72
+  metadata.gz: c1e5bae2d12dfe7802bdb64f7df36cbff480c39e8215196a95ce3375dee7cb413b3a9b6f8e958fa8a3462d2b752c10e7544aefbeb4f2400119c3780d7f8a3ac3
+  data.tar.gz: 9e508ece749fe38479b92ce3331d1711e55248524b76cd2945c8f45d15c52a2b3c1d243a3b2ef76e5a7c58aa315e845a1b6888bbd7bccce41299843df2a4dc92

data/Gemfile.lock

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

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

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

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

@@ -6,6 +6,7 @@ module BlsmVdCore
     has_many :applications, class_name: "::BlsmVdCore::Application"
     has_many :clearings, class_name: "::BlsmVdCore::Clearing"
     has_one :vd_user_info, class_name: "::BlsmVdCore::VdUserInfo"
+    belongs_to :rc_user, class_name: "::BlsmVdCore::RcUser"
 
     def create_vd_user_info
       unless self.vd_user_info

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

@@ -0,0 +1,112 @@
+# coding: utf-8
+module BlsmVdCore
+  class VdRcMsgNotify < BlsmVdCore::BaseRecord
+    self.table_name = 'vd_rc_msg_notifies'
+
+    TO_TYPES = {
+        'single' => '指定首趣昵称',
+        'vd_team' => '指定黑带团队'
+    }
+
+    MSG_TYPES = {
+        'RC:TxtMsg' => '文本消息',
+        'CU:ImgTextMsg' => '图文消息',
+        'CU:MoreImgTextMsg' => '多图文消息',
+        'CU:TemplateMsg' => '模板消息'
+    }
+
+
+    # 店主:新订单通知
+    def self.create_new_order_notify(user_id, order_id)
+      user = BlsmVdCore::User.where(id: user_id).first
+      order = Order.where(id: order_id).first
+      return nil unless order && 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: "您好，客户#{order.ubox_order? ? '' : order.name}在您店里下了一个订单，请及时处理。"
+                                               },
+                                               items: [
+                                                   "下单时间:#{order.created_at.to_s[0, 16]}",
+                                                   "支付方式:#{order.pay_type.to_i==0 ? '在线支付' : '货到付款'}",
+                                                   "客户信息:#{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}"
+                                           }.to_json
+                                       })
+
+    end
+
+
+    #创建结算通知
+    #  msg_content['content'] 标题内容
+    #  msg_content['change'] 结算金额
+    #  msg_content['account_type'] 账户类型
+    #  msg_content['total']  账户总余额
+    def self.create_account_change_notify(user_id, msg_content)
+      user = BlsmVdCore::User.where(id: user_id).first
+      return nil unless user && user.rc_user
+
+      msg_content = msg_content.symbolize_keys
+      BlsmVdCore::VdRcMsgNotify.create({
+                                           user_id: 3,
+                                           to_ids: user.username,
+                                           to_type: 'single',
+                                           msg_type: 'CU:TemplateMsg',
+                                           title: '结算通知',
+                                           content: {
+                                               title: '结算通知',
+                                               content: {
+                                                   body: msg_content[:content]
+                                               },
+                                               items: [
+                                                   "结算账户:#{user.phone}",
+                                                   "结算时间:#{Time.now.strftime('%F')}",
+                                                   "结算金额:#{msg_content[:change]}",
+                                                   "#{msg_content[:account_type]}余额:#{msg_content[:total]}",
+                                                   "备注:感谢您对首趣一如既往的支持，商城客户热线4007060700！"
+                                               ],
+                                               url: 'http://wunion.4007060700.com/mobile/jms_orders'
+                                           }.to_json
+                                       })
+
+    end
+
+
+    #创建订单拒签通知
+    def self.create_order_sign_fail_notify(user_id, score_change, order_number, content)
+      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: content
+                                               },
+                                               items: [
+                                                   "订单编号:#{order_number}",
+                                                   "积分变动:#{score_change}",
+                                                   "积分余额:#{user.create_vd_user_info.score}"
+                                               ],
+                                               url: 'http://wunion.4007060700.com/mobile/jms_orders'
+                                           }.to_json
+                                       })
+
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module BlsmVdCore
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
 end

data/lib/blsm-vd-core.rb

@@ -18,6 +18,8 @@ require 'blsm-vd-core/model/vd_user_info'
 require 'blsm-vd-core/model/vd_user_score'
 require 'blsm-vd-core/model/vd_info_sec'
 require 'blsm-vd-core/model/vd_wx_pay'
+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 'faraday'
@@ -386,15 +388,20 @@ module BlsmVdCore
     # seller_info = seller.create_vd_user_info
     # leader_info = leader && leader.is_vd_black? ? leader.create_vd_user_info : nil
 
-    content = "您的订单(编号#{order.number})客户先签收后又拒签。"
+    content = "您的订单(编号#{order.number})客户先签收后又取消。"
     VdUserScore.where(score_type: score_type_str).each do |score|
       score_change = -score.score
       if score.user && !order.ubox_order? && score_change!=0
         score.user.create_vd_user_info.change_score(score_change)
 
-        content = "您的队员#{seller.username}的订单(订单编号#{order.number})客户先签收后又拒签。" if seller.id != score.user.id
+        content = "您的队员#{seller.username}的订单(订单编号#{order.number})客户先签收后又取消。" if seller.id != score.user.id
         notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "变动原因：#{content}"}
+
+        #变动通知
         BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
+        VdRcMsgNotify.create_order_sign_fail_notify(score.user_id, score_change, order.number, content)
+
+        #积分历史
         VdUserScore.create({
                                user_id: score.user_id,
                                score: score_change,
@@ -433,16 +440,24 @@ module BlsmVdCore
     vd_transaction = "order_sale_out_#{seller_id}_#{order_id}_then_sign_fail"
     return ERROR_CODES[200] if VdInfoSec.dangerous?(vd_transaction)
 
+    content = "您的订单(编号#{order.number})客户先签收后又拒签。"
     VdUserScore.where(score_type: score_type_str).each do |score|
       score_change = -score.score
       if score.user && !order.ubox_order?
         score.user.create_vd_user_info.change_score(score_change)
-        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: "订单#{order_id}拒签"}
+
+        content = "您的队员#{seller.username}的订单(订单编号#{order.number})客户先签收后又拒签。" if seller.id != score.user.id
+        notify = {touser: score.user.openid, change: score_change, total: score.user.create_vd_user_info.score, content: content}
+
+        #变动通知
         BlsmMpWx.create_msg(nil, score.user.openid, notify, 'score_change')
+        VdRcMsgNotify.create_order_sign_fail_notify(score.user_id, score_change, order.number, content)
+
+        #积分历史
         VdUserScore.create({
                                user_id: score.user_id,
                                score: score_change,
-                               notes: "订单#{order.number}拒签，积分扣取",
+                               notes: content,
                                score_type: vd_transaction
                            })
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blsm-vd-core
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - saxer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -192,9 +192,11 @@ files:
 - lib/blsm-vd-core/model/order.rb
 - 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/ubox_vm.rb
 - lib/blsm-vd-core/model/user.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
 - lib/blsm-vd-core/model/vd_user_score.rb
 - lib/blsm-vd-core/model/vd_wx_pay.rb