eric_weixin 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6775d0e610f51738e488e722f58f34a0db552ab3
-  data.tar.gz: ca0e47cab7ee7cad6429a901c0f37d9ca198ae57
+  metadata.gz: 04e1abdd9c635cd4590d5c0195ad1ffdfdb7403c
+  data.tar.gz: 334908139a06070d009af276bb0854879b59c431
 SHA512:
-  metadata.gz: 80a532952c4b832ae691ee11c997bad009cc2f11562f703e432774ace11802f0c18b9e0ddf08bfe7de2fcd7f746a122d271667ea9c8fdf76a3083de70c7e8662
-  data.tar.gz: 55e468000e92ac97b1b5bfc03ce86a9a70937efd913b63e9b62b25195c77519bf02eb1f6700ce66d3990c2ffb870f20bf468f91ec0de75d9f564dd4807742d10
+  metadata.gz: baf9f37558801003173f17a46ba2c44356e9cd45da49bf7d957e4675560c01e53df73f28e5ef85ea0b42ffa9159d3fb352b927c5d46ddf56e2679256e53bb1e2
+  data.tar.gz: e1231514d5bca951aa94c7072b53e5b675f0551da1ae183f0ef5b6c394c12075ce8096424e29d66c601c2961d9220c408709d9637abd8b1e3c6f0ef9fb7a7429

data/README.rdoc

@@ -3,9 +3,11 @@
 目前EricWeixin已封装了认证服务号80%以上的接口，并且有一套后台管理界面与功能自成体系。
 * 官网暂无。
 * 大部分功能正在研发中。
+* 要求数据库支持 utf8mb4 编码格式。 用于表情存储。 mysql 要求在 5.5及以上版本。
 
 == requirements
 从大的情况来看，基本上适用于rails4.1.4及以上版本。我自己则是在4.1.4版本上进行研发。
+Gem 中使用了delayed_job 作为队列机制，用来加快响应速度。 在项目中需要配置好队列。具体可参考：
 细节待更新。
 
 ==使用方式
@@ -31,6 +33,8 @@
 * 微信小店商品刷新 /eric_weixin/cms/weixin/xiaodian/products
 * 微信用户展示 /eric_weixin/cms/weixin/weixin_users
 
+===客户展示链接
+* 查看"我的订单" eric_weixin/weixin/orders?openid=<OPENID>
 
 ===微信小店的初始化
 * 首先对所经营的分类进行归类，并且把腾讯分类同步至数据库。为了避免分类过多，一般只同步自己行业的大类，大类编号请自查，如儿童玩具大类，食品类两类更新如下：
@@ -48,11 +52,16 @@ EricWeixin::Xiaodian::Order.get_order_list_and_update nil, nil ,nil ,'公众账
 * 先在项目根目录新建一个名字叫ca的目录，并设置权限，让应用程序可读。 ca目录用于存放微信官方密钥证书，主要用于发红包过程中的通信加密。
 * 在weixin_public_account中设置：mch_id: 商户号， mch_key：在商户后台写的32位的那个密码，host_name_wich_schema： 当前域名，在回调时需要参考此参数。
 * 调用方式：
-EricWeixin::RedpackOrder.create_redpack_order wishing: 'xxx',
-                                              client_ip: '127.0.0.1', # 换成自己服务器ip
-                                              act_name: '过年送红包',
-                                              remark: '一起开心一下，祝新年快乐',
-                                              send_name: 'U果源',
-                                              re_openid: openid, # 收红包人的openid
-                                              total_amount: 100 # 金额： 单位（分）
-* 定时获取红包信息：使用EricWeixin::RedpackOrder的实例调用 get_info 信息。
+    EricWeixin::RedpackOrder.create_redpack_order wishing: 'xxx',
+                                                client_ip: '127.0.0.1', # 换成自己服务器ip
+                                                act_name: '过年送红包',
+                                                remark: '一起开心一下，祝新年快乐',
+                                                send_name: 'U果源',
+                                                re_openid: openid, # 收红包人的openid
+                                                total_amount: 100 # 金额： 单位（分）
+* 定时获取红包信息：使用EricWeixin::RedpackOrder的实例调用 get_info 信息。
+
+===队列配置
+* 队列配置详情： https://github.com/collectiveidea/delayed_job。
+* 可以起多个任务：
+

data/app/assets/stylesheets/eric_weixin/wz/base.css.scss

@@ -0,0 +1,72 @@
+.xiaodian_orders{
+  width: 100%;
+  margin: 0px;
+  height: 100%;
+  background-color: #f2f2f2;
+  .no_xiaodian_order{
+    display: table;
+    height: 100%;
+    width: 100%;
+    text-align: center;
+    .no_order_suggestion{
+      display: table-cell;
+      vertical-align: middle;
+    }
+  }
+  .xiaodian_order{
+    font-size: 12px;
+    background: white;
+    border-bottom: 1px solid #e7e7e7;
+    margin-bottom: .8rem;
+    padding: .17rem .4rem;
+    img{
+      float: left;
+      width: 90px;
+    }
+    .product_info-list{
+
+      .product_info-title{
+        overflow: hidden;
+        .product_info-name{
+          float: left;
+          font-size: 16px;
+        }
+        .product_info-time{
+          float: right;
+          color: #999;
+        }
+      }
+      .product_info-description{
+        overflow: hidden;
+        .product_info-part{
+          float: left;
+          color: #999;
+          margin-right: 10px;
+        }
+      }
+
+    }
+    .user_info-list{
+      overflow: hidden;
+      .user_info-user{
+        overflow: hidden;
+        .user_info-part{
+          float: left;
+          width: 50%;
+        }
+      }
+      .user_info-address{
+        float: left;
+      }
+
+    }
+    .delivery_info-list{
+      overflow: hidden;
+      .delivery_info-part{
+        float: left;
+        width: 50%;
+      }
+    }
+  }
+}
+

data/app/controllers/eric_weixin/cms/weixin/media_news_controller.rb

@@ -23,7 +23,7 @@ class EricWeixin::Cms::Weixin::MediaNewsController < EricWeixin::Cms::BaseContro
       options[:weixin_public_account_id] = params[:public_account_id]
       options[:nickname] = params[:nickname]
       @weixin_users = ::EricWeixin::WeixinUser.where(weixin_public_account_id: params[:public_account_id])
-      @weixin_users = @weixin_users.where("nickname like ?", "%#{CGI::escape(params[:nickname])}%") unless params[:nickname].blank?
+      @weixin_users = @weixin_users.where("nickname like ?", "%#{params[:nickname]}%") unless params[:nickname].blank?
       render partial: 'select_user'
     rescue Exception=>e
       dispose_exception e

data/app/controllers/eric_weixin/cms/weixin/weixin_users_controller.rb

@@ -22,4 +22,28 @@ class EricWeixin::Cms::Weixin::WeixinUsersController < EricWeixin::Cms::BaseCont
     user.reload
     render text: user.remark
   end
+
+  def quick_get_user_infos
+    public_account = ::EricWeixin::PublicAccount.find(params[:public_account_id])
+    if public_account.blank?
+      flash[:alert] = '未指定公众账号'
+      redirect_to action: :index
+      return
+    end
+    public_account.delay(:priority => 10).rebuild_users_simple
+    flash[:success] = '已经把快速更新微信用户信息任务添加到队列任务中'
+    redirect_to action: :index
+  end
+
+  def batch_update_user_infos
+    public_account = ::EricWeixin::PublicAccount.find(params[:public_account_id])
+    if public_account.blank?
+      flash[:alert] = '未指定公众账号'
+      redirect_to action: :index
+      return
+    end
+    public_account.delay(:priority => 10).update_users
+    flash[:success] = '已经把批量更新微信用户信息任务添加到队列任务中'
+    redirect_to action: :index
+  end
 end

data/app/controllers/eric_weixin/cms/weixin/xiaodian/orders_controller.rb

@@ -1,8 +1,6 @@
 class EricWeixin::Cms::Weixin::Xiaodian::OrdersController < EricWeixin::Cms::BaseController
   def index
-    @orders = EricWeixin::Xiaodian::Order.all
-    @orders = @orders.where("order_create_time >= ?", params[:start_date].to_time.change(hour:0,min:0,sec:0).to_i) unless params[:start_date].blank?
-    @orders = @orders.where("order_create_time <= ?", params[:end_date].to_time.change(hour:23,min:59,sec:59).to_i) unless params[:end_date].blank?
+    @orders = EricWeixin::Xiaodian::Order.order_query params
     @orders = @orders.order(order_create_time: :desc).paginate(per_page: params[:per_page]||6, page: params[:page]||1)
   end
 
@@ -27,7 +25,42 @@ class EricWeixin::Cms::Weixin::Xiaodian::OrdersController < EricWeixin::Cms::Bas
   end
 
   def download_orders
-    file_name = EricWeixin::Xiaodian::Order.get_excel_of_orders params.permit(:start_date, :end_date)
+    file_name = EricWeixin::Xiaodian::Order.get_excel_of_orders params.permit(:start_date, :end_date, :deliver_status, :buyer_nick, :receiver_name, :receiver_mobile)
     send_file file_name
   end
+
+  def update_hb_infos
+    EricWeixin::RedpackOrder.delay(priority: 10).update_info_from_wx params[:public_account_id]
+    flash[:success] = '已经将更新红包任务放到队列'
+    redirect_to action: :index
+  end
+
+  def update_order_infos
+    # 默认更新本月订单
+    params[:start_date] ||= Time.now.beginning_of_month
+    params[:end_date] ||= Time.now.end_of_month
+    params[:start_date] = params[:start_date].to_date.change(hour:0,min:0,sec:0)
+    params[:end_date] = params[:end_date].to_date.change(hour:23,min:59,sec:59)
+
+    EricWeixin::Xiaodian::Order.delay(priority: 10).update_order_infos params[:start_date], params[:end_date]
+    flash[:success] = '已经将更新订单信息的任务放到队列'
+    redirect_to action: :index
+  end
+
+  def update_delivery_info_by_excel
+    begin
+      if params[:file].blank?
+        flash[:alert] = '请先选择文件,再更新快递单信息'
+        redirect_to action: :index
+        return
+      end
+      flash[:success] = EricWeixin::Xiaodian::Order.update_delivery_info_by_excel params[:file]
+      redirect_to action: :index
+    rescue Exception=> e
+      dispose_exception e
+      flash[:alert] = get_notice_str
+      redirect_to action: :index
+    end
+  end
+
 end

data/app/controllers/eric_weixin/wz/xiaodian/orders_controller.rb

@@ -0,0 +1,8 @@
+class EricWeixin::Wz::Xiaodian::OrdersController < ApplicationController
+  def index
+    @orders = ::EricWeixin::Xiaodian::Order.all
+    @orders = @orders.where("openid = ?", params[:openid]).order('order_create_time DESC') unless params[:openid].blank?
+    @orders = @orders.paginate(page: params[:page]||1, per_page: 10)
+    render :layout => false
+  end
+end

data/app/models/eric_weixin/customs_service_record.rb

@@ -95,7 +95,7 @@ class EricWeixin::CustomsServiceRecord < ActiveRecord::Base
 
     unless options[:nick_name].blank?
       records = records.joins('LEFT JOIN weixin_users ON weixin_users.openid = weixin_customs_service_records.openid')
-      records = records.where("weixin_users.nickname like ?", "%#{CGI::escape(options[:nick_name])}%")
+      records = records.where("weixin_users.nickname like ?", "%#{options[:nick_name]}%")
     end
 
     records

data/app/models/eric_weixin/media_news.rb

@@ -17,7 +17,7 @@ class EricWeixin::MediaNews < ActiveRecord::Base
   #           "thumb_media_id" => article.media_resource.media_id,
   #           "author" => article.author,
   #           "content_source_url" => article.content_source_url,
-  #           "content" => CGI::escape(article.content).force_encoding("UTF-8"),
+  #           "content" => article.content.force_encoding("UTF-8"),
   #           "digest" => article.digest,
   #           "show_cover_pic" => if article.show_cover_pic then 1 else 0 end
   #       }
@@ -52,7 +52,7 @@ class EricWeixin::MediaNews < ActiveRecord::Base
             "thumb_media_id" => article.media_resource.media_id,
             "author" => article.author,
             "content_source_url" => article.content_source_url,
-            "content" => CGI::escape(article.content.gsub("\"","'")),
+            "content" => article.content.gsub("\"","'"),
             "digest" => article.digest,
             "show_cover_pic" => if article.show_cover_pic then 1 else 0 end
         }

data/app/models/eric_weixin/public_account.rb

@@ -98,6 +98,50 @@ class EricWeixin::PublicAccount < ActiveRecord::Base
     end
   end
 
+  # 更新数据库现有的微信用户信息,用了微信的批量获取用户数据的接口
+  # ===参数说明
+  # 无
+  # ===调用示例
+  # ::EricWeixin::PublicAccount.first.update_users
+  def update_users
+    openids = self.weixin_users.pluck(:openid, :language)
+    index = 0
+    while index <= openids.count
+      params = {}
+      openid_arr = []
+      openids[index..index+99].each do |op|
+        openid_arr << {
+            :openid => op[0],
+            :lang => op[1]
+        }
+      end
+      index += 100
+      params[:user_list] = openid_arr
+      token = ::EricWeixin::AccessToken.get_valid_access_token public_account_id: self.id
+      response = RestClient.post "https://api.weixin.qq.com/cgi-bin/user/info/batchget?access_token=#{token}", params.to_json
+      response = JSON.parse response.body
+      response["user_info_list"].each do |user_info|
+        user = EricWeixin::WeixinUser.find_or_create_by(openid: user_info["openid"], weixin_public_account_id: self.id)
+        if user_info["subscribe"] == 1
+          user_params = user_info.select{|k,v|["subscribe",
+                                               "openid",
+                                               "nickname",
+                                               "sex",
+                                               "language",
+                                               "city",
+                                               "province",
+                                               "country",
+                                               "headimgurl",
+                                               "subscribe_time",
+                                               "remark"].include?(k) && !v.blank?}
+          user.update_attributes user_params
+        else
+          user.update_attributes subscribe: 0
+        end
+      end unless response["user_info_list"].blank?
+    end unless openids.count == 0
+  end
+
   # 获取用户列表，并把最新的用户信息存到数据库.
   # ===参数说明
   # * next_openid   #拉取列表的后一个用户的 next_openid，用户列表未拉取完时存在。
@@ -111,6 +155,7 @@ class EricWeixin::PublicAccount < ActiveRecord::Base
                  RestClient.get "https://api.weixin.qq.com/cgi-bin/user/get?access_token=#{token}&next_openid=#{next_openid}"
                end
     response = JSON.parse response.body
+    pp response
     if response["count"].to_i > 0
       response["data"]["openid"].each do |openid|
         ::EricWeixin::WeixinUser.create_weixin_user self.id, openid
@@ -133,13 +178,12 @@ class EricWeixin::PublicAccount < ActiveRecord::Base
                  RestClient.get "https://api.weixin.qq.com/cgi-bin/user/get?access_token=#{token}&next_openid=#{next_openid}"
                end
     response = JSON.parse response.body
+    pp response
     if response["count"].to_i > 0
       response["data"]["openid"].each do |openid|
         users = ::EricWeixin::WeixinUser.where openid: openid
         if users.blank?
-
             ::EricWeixin::WeixinUser.create_weixin_user self.id, openid
-
         end
       end
       tmp_next_openid = response["next_openid"]

data/app/models/eric_weixin/redpack_order.rb

@@ -51,7 +51,7 @@ class EricWeixin::RedpackOrder < ActiveRecord::Base
 
   # 定时使用 redpack_order 实例变量来完善补充红包信息。
   def get_info
-    return unless self.redpacks.blank?
+    # return if self.redpacks.blank?
     EricWeixin::RedpackOrder.transaction do
       options = {}
       options[:mch_billno] = self.mch_billno
@@ -90,4 +90,13 @@ class EricWeixin::RedpackOrder < ActiveRecord::Base
     end
   end
 
+  # 指定公众号，从微信服务器更新红包信息
+  # EricWeixin::RedpackOrder.update_info_from_wx 1
+  def self.update_info_from_wx public_account_id
+    self.where("detail_id is null and weixin_public_account_id = ? ", public_account_id).each do |r_o|
+      r_o.get_info
+    end
+    return
+  end
+
 end

data/app/models/eric_weixin/reply_message_rule.rb

@@ -41,7 +41,7 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
     #处理来自微信端客户所有的处理。
     def process_rule(receive_message, public_account)
       receive_message_log = receive_message.clone
-      receive_message_log[:Content] = CGI::escape(receive_message_log[:Content]) if not receive_message_log[:Content].blank?
+      receive_message_log[:Content] = receive_message_log[:Content] if not receive_message_log[:Content].blank?
       business_type = "#{receive_message[:MsgType]}~#{receive_message[:Event]}"
 
       #兼容腾讯的一个坑....有的是MsgId， 有的是MsgID
@@ -195,6 +195,7 @@ class EricWeixin::ReplyMessageRule < ActiveRecord::Base
                           ::EricWeixin::MediaNews.update_media_news_after_sending receive_message
                           ::Weixin::Process.message_send_job_finish receive_message
                           ''
+
                         #暂时识别不了的消息
                         else
                           "暂时未处理的场景".to_logger

data/app/models/eric_weixin/weixin_user.rb

@@ -1,5 +1,5 @@
 class EricWeixin::WeixinUser < ActiveRecord::Base
-  SEX = {1=>'男' , 2=>'女', 0=>'未知'}
+  SEX = {1 => '男', 2 => '女', 0 => '未知'}
   self.table_name = 'weixin_users'
   belongs_to :member_info
   belongs_to :weixin_public_account, :class_name => '::EricWeixin::PublicAccount', :foreign_key => 'weixin_public_account_id'
@@ -22,7 +22,7 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
     @target_user = @target_user.where("created_at > ? AND created_at < ?", user[:created_at_start], user[:created_at_end]) unless user[:created_at_start].blank? || user[:created_at_end].blank?
     @target_user = @target_user.where("updated_at > ? AND updated_at < ?", user[:updated_at_start], user[:updated_at_end]) unless user[:updated_at_start].blank? || user[:updated_at_end].blank?
     @target_user = @target_user.where("subscribe = ?", user[:subscribe]) unless user[:subscribe].blank?
-    @target_user = @target_user.where("nickname = ?", CGI::escape(user[:nickname])) unless user[:nickname].blank?
+    @target_user = @target_user.where("nickname = ?", user[:nickname]) unless user[:nickname].blank?
     @target_user = @target_user.where("sex = ?", user[:sex]) unless user[:sex].blank?
     @target_user = @target_user.where("language = ?", user[:language]) unless user[:language].blank?
     @target_user = @target_user.where("city = ?", user[:city]) unless user[:city].blank?
@@ -38,7 +38,7 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
   end
 
   def nickname
-    CGI::unescape(self.attributes["nickname"]) rescue '无法正常显示'
+    self.attributes["nickname"]
   end
 
   ##
@@ -63,7 +63,6 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
   end
 
   class << self
-
     # ===业务说明：创建、更新微信用户.
     # * 微信用户在关注、取消关注时更新用户信息。
     # * 当用户关注微信时，创建用户。
@@ -79,28 +78,42 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
     def create_weixin_user(public_account_id, openid, channel=nil)
       is_new = false
       public_account = ::EricWeixin::PublicAccount.find_by_id(public_account_id)
+      weixin_user = ::EricWeixin::WeixinUser.where(openid: openid, weixin_public_account_id: public_account.id).first
       ::EricWeixin::ReplyMessageRule.transaction do
         is_new = false
-        weixin_user = ::EricWeixin::WeixinUser.where(openid: openid, weixin_public_account_id: public_account.id).first
         if weixin_user.blank?
           is_new = true
           weixin_user = ::EricWeixin::WeixinUser.new openid: openid,
-                                       weixin_public_account_id: public_account.id
+                                                     weixin_public_account_id: public_account.id
           weixin_user.save!
           is_new = true
         end
-      end  #因为后续更新用户信息消耗时间较长，在这里必须得提交一次，以便二次创建用户。
-        wx_user_data = public_account.get_user_data_from_weixin_api openid
-        weixin_user.update_attributes(wx_user_data.select{|k,v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark"].include? k })
-        if not channel.blank?
-          weixin_user.first_register_channel = channel if weixin_user.first_register_channel.blank?
-          weixin_user.last_register_channel = channel
-          weixin_user.save!
-        end
-        return weixin_user, is_new
+      end
+
+      ::EricWeixin::WeixinUser.delay(:priority => -10).get_info public_account_id, openid
+      if not channel.blank?
+        weixin_user.first_register_channel = channel if weixin_user.first_register_channel.blank?
+        weixin_user.last_register_channel = channel
+        weixin_user.save!
+      end
+      return weixin_user, is_new
+    end
+
 
+    # 调腾讯接口，完善用户具体信息。
+    def get_info public_account_id, openid
+      public_account = ::EricWeixin::PublicAccount.find_by_id(public_account_id)
+      wx_user_data = public_account.get_user_data_from_weixin_api openid
+      weixin_user = ::EricWeixin::WeixinUser.where(openid: openid, weixin_public_account_id: public_account.id).first
+      pp wx_user_data["subscribe"]
+      if wx_user_data["subscribe"] == 0
+        weixin_user.update_attributes(wx_user_data.select { |k, v| ["subscribe"].include? k })
+      else
+        weixin_user.update_attributes(wx_user_data.select { |k, v| ["subscribe", "openid", "nickname", "sex", "language", "city", "province", "country", "headimgurl", "subscribe_time", "remark"].include? k })
+      end
     end
 
+
     # ===获取用户详情.
     # 根据公众账号id和openid获取公众账号详细信息，最后返回json。
     # ===输入参数说明
@@ -112,7 +125,6 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
       token = ::EricWeixin::AccessToken.get_valid_access_token public_account_id: public_account_id
       response = RestClient.get "https://api.weixin.qq.com/cgi-bin/user/info?access_token=#{token}&openid=#{openid}&lang=zh_CN"
       response = JSON.parse response.body
-      response["nickname"] = CGI::escape(response["nickname"]) if not response["nickname"].blank?
       response
     end
 
@@ -123,11 +135,22 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
         csv << ["订阅状态", "openid", "昵称", "性别", "语言", "城市", "省份", "国家", "订阅时间"]
         weixin_users.each do |weixin_user|
           user_fields = []
-          user_fields << (weixin_user.follow_status ? '订阅': '取消订阅')
+          user_fields << (weixin_user.follow_status ? '订阅' : '取消订阅')
           user_fields << weixin_user.openid
           user_fields << weixin_user.nickname
-          user_fields << case weixin_user.sex when 1 then '男' when 2 then '女' else '未知' end
-          user_fields << case weixin_user.language when 'zh_CN' then '简体中文' when 'zh_TW' then '繁体中文' when 'en' then '英文' else '其它' end
+          user_fields << case weixin_user.sex when 1 then
+                                                '男' when 2 then
+                                                      '女'
+                           else
+                             '未知'
+                         end
+          user_fields << case weixin_user.language when 'zh_CN' then
+                                                     '简体中文' when 'zh_TW' then
+                                                              '繁体中文' when 'en' then
+                                                                       '英文'
+                           else
+                             '其它'
+                         end
           user_fields << weixin_user.city
           user_fields << weixin_user.province
           user_fields << weixin_user.country
@@ -161,7 +184,7 @@ class EricWeixin::WeixinUser < ActiveRecord::Base
     def custom_query options
       users = self.all
       users = users.where(subscribe: options[:subscribe]) unless options[:subscribe].blank?
-      users = users.where("nickname like ?", "%#{CGI::escape(options[:nickname])}%") unless options[:nickname].blank?
+      users = users.where("nickname like ?", "%#{options[:nickname]}%") unless options[:nickname].blank?
       users = users.where(sex: options[:sex]) unless options[:sex].blank?
       users = users.where(city: options[:city]) unless options[:city].blank?
       users = users.where(province: options[:province]) unless options[:province].blank?