eric_weixin 0.3.3 → 0.4.0

data/app/models/eric_weixin/xiaodian/order.rb

@@ -1,6 +1,6 @@
 class EricWeixin::Xiaodian::Order < ActiveRecord::Base
   self.table_name = 'weixin_xiaodian_orders'
-  belongs_to :weixin_user, class_name: "::EricWeixin::WeixinUser"
+  # belongs_to :weixin_user, class_name: "::EricWeixin::WeixinUser"
   belongs_to :product, class_name: "::EricWeixin::Xiaodian::Product", foreign_key: 'weixin_product_id'
   belongs_to :weixin_public_account, class_name: "::EricWeixin::PublicAccount", foreign_key: 'weixin_public_account_id'
   # 接收订单
@@ -17,12 +17,17 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
       "zj001yixun" => "易迅快递"
   }
 
+  def weixin_user
+    ::EricWeixin::WeixinUser.find_by_openid self.openid
+  end
+
   def product_info
     return '' if self.sku_info.blank?
     info = ""
     list = self.sku_info.split(";")
     list.each do |sku|
       str = sku.split(":")[1]
+      return 'error' if str.blank?
       if str.match /^\$/
         info += str[1,str.size-1]
         info += "、"
@@ -51,13 +56,11 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
   def self.create_order options
     order = EricWeixin::Xiaodian::Order.where(order_id: options[:OrderId]).first
     unless order.blank?
-      order.get_info
+      order.delay(:priority => -10).get_info
       return order
     end
-
     openid = options[:FromUserName]
-    user = EricWeixin::WeixinUser.where(openid: openid).first
-
+    # user = EricWeixin::WeixinUser.where(openid: openid).first
     to_user_name = options[:ToUserName]
     account = EricWeixin::PublicAccount.where(weixin_number: to_user_name).first
 
@@ -68,15 +71,15 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
     end
 
 
-    if user.blank?
-      account.rebuild_users_simple
-      user = EricWeixin::WeixinUser.where(openid: openid).first
-    end
+    # if user.blank?
+    #   account.delay.rebuild_users_simple
+    #   # user = EricWeixin::WeixinUser.where(openid: openid).first
+    # end
 
-    user_id = user.blank? ? nil : user.id
+    # user_id = user.blank? ? nil : user.id
 
     order = EricWeixin::Xiaodian::Order.new order_id: options[:OrderId],
-                                            weixin_user_id: user_id,
+
                                             order_create_time: options[:CreateTime],
                                             order_status: options[:OrderStatus],
                                             weixin_product_id: product.id,
@@ -85,16 +88,24 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
                                             openid: openid
     order.save!
 
-    order.get_info
+    order.delay(:priority => -10).get_info
 
     order
   end
 
 
-  def buyer_nick
-    CGI::unescape(self.attributes["buyer_nick"]) rescue '无法正常显示'
-  end
+  # def buyer_nick
+  #   CGI::unescape(self.attributes["buyer_nick"]) rescue '无法正常显示'
+  # end
 
+  # 更新指定时间区间的订单信息
+  # EricWeixin::Xiaodian::Order.update_order_infos
+  def self.update_order_infos start_date, end_date
+    self.where("order_create_time between ? and ? ", start_date.to_time.to_i, end_date.to_time.to_i).each do |order|
+      order.get_info
+    end
+    true
+  end
 
   # 根据订单ID获取订单详情
   def get_info
@@ -107,18 +118,8 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
       ["receiver_zip", "product_id", "buyer_openid"].each do |a|
         order_params.delete a
       end
-
-      order_params["buyer_nick"] = CGI::escape(order_params["buyer_nick"]) if not order_params["buyer_nick"].blank?
-
-
-
-      # 获取订单详情前，weixin_product_id、sku_info、weixin_user_id应该已经有了值
-      # weixin_product = EricWeixin::Xiaodian::Product.where( product_id: order_params["product_id"], weixin_public_account_id: self.weixin_public_account_id ).first
-      # order_params.merge!("weixin_product_id"=>weixin_product.id) unless weixin_product.blank?
-      # weixin_user = EricWeixin::WeixinUser.where(openid: order_params["buyer_openid"], weixin_public_account_id: self.weixin_public_account_id).first
-      # order_params.merge!("weixin_user_id"=>weixin_user.id) unless weixin_user.blank?
-
-      self.update_attributes order_params
+      self.update_attributes order_params.select{|k,v| ['order_id', 'order_status', 'order_total_price', 'order_create_time', 'order_express_price', 'buyer_nick', 'receiver_name', 'receiver_province', 'receiver_city', 'receiver_zone', 'receiver_address', 'receiver_mobile', 'receiver_phone',
+                             'product_name', 'product_name', 'product_sku', 'product_count', 'product_img', 'trans_id'].include? k }
     else
       pp response
       return
@@ -143,6 +144,8 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
     if response["errcode"] == 0
       order_list = response["order_list"]
       order_list.each do |order|
+        orders = EricWeixin::Xiaodian::Order.where order_id: order["order_id"]
+        next unless orders.blank?
         EricWeixin::Xiaodian::Order.create_order OrderId: order["order_id"],
                                                  FromUserName: order["buyer_openid"],
                                                  ToUserName: account.weixin_number,
@@ -187,7 +190,7 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
   # 是否为6.4.5表之外的其它物流公司(0-否，1-是，无该字段默认为不是其它物流公司)
 
   def set_delivery options
-    pp options
+    # pp options
     if options["need_delivery"].to_s == "0"
       options = {need_delivery: 0}
     else
@@ -202,83 +205,58 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
     response = RestClient.post "https://api.weixin.qq.com/merchant/order/setdelivery?access_token=#{token}", options.to_json
     response = JSON.parse response.body
     if response["errcode"] == 0
-      true
       if options["need_delivery"].to_s == "0"
         self.update_attributes delivery_id: "", delivery_company: ""
       else
         self.update_attributes delivery_id: options["delivery_track_no"], delivery_company: options["delivery_company"]
       end
+      true
     else
       false
     end
   end
 
+  # need_deliver 1:未发货  0 已发货
   def self.get_excel_of_orders options
-    orders = self.all
-    orders = orders.where("order_create_time >= ?", options[:start_date].to_time.change(hour:0,min:0,sec:0).to_i) unless options[:start_date].blank?
-    orders = orders.where("order_create_time <= ?", options[:end_date].to_time.change(hour:23,min:59,sec:59).to_i) unless options[:end_date].blank?
+    orders = self.order_query options
+    # if options[:need_deliver] == '1'
+    #   orders = orders.where("delivery_id is null or delivery_id = '' or delivery_company is null or delivery_company = '' ")
+    # else
+    #   orders = orders.where("delivery_id is not null and delivery_id <> '' and delivery_company is not null and delivery_company <> '' ")
+    # end
     orders = orders.order(order_create_time: :desc)
 
     Spreadsheet.client_encoding = 'UTF-8'
     book = Spreadsheet::Workbook.new
 
     sheet1 = book.create_worksheet name: '订单表'
-    sheet1.row(0)[0] = "id"
-    sheet1.row(0)[1] = "买家昵称"
-    sheet1.row(0)[2] = "订单ID"
-    sheet1.row(0)[3] = "产品名称"
-    sheet1.row(0)[4] = "sku"
-    sheet1.row(0)[5] = "订单状态"
-    sheet1.row(0)[6] = "总金额"
-    sheet1.row(0)[7] = "订单生成时间"
-    sheet1.row(0)[8] = "快递费"
-    sheet1.row(0)[9] = "昵称"
-    sheet1.row(0)[10] = "收货人"
-    sheet1.row(0)[11] = "省"
-    sheet1.row(0)[12] = "城市"
-    sheet1.row(0)[13] = "区"
-    sheet1.row(0)[14] = "地址"
-    sheet1.row(0)[15] = "移动电话"
-    sheet1.row(0)[16] = "固定电话"
-    sheet1.row(0)[17] = "产品名"
-    sheet1.row(0)[18] = "单价"
-    sheet1.row(0)[19] = "产品sku"
-    sheet1.row(0)[20] = "数量"
-    sheet1.row(0)[21] = "产品图片url"
-    sheet1.row(0)[22] = "运单ID"
-    sheet1.row(0)[23] = "快递公司"
-    sheet1.row(0)[24] = "交易ID"
-    sheet1.row(0)[25] = "openid"
-    sheet1.row(0)[26] = "公众号名称"
+    sheet1.row(0).push '产品名称', '数量', '收货人', '移动电话', '快递公司', '快递单号', '买家昵称', '订单ID', '固定电话', '省', '城市', '区', '地址', '是否是粉丝', '订单时间', '快递费(单位:元)', '总金额(单位:元)'
+
     current_row = 1
     orders.each do |order|
-      sheet1.row(current_row)[0] = order.id
-      sheet1.row(current_row)[1] = order.weixin_user.nickname rescue ''
-      sheet1.row(current_row)[2] = order.order_id
-      sheet1.row(current_row)[3] = order.product.name rescue ''
-      sheet1.row(current_row)[4] = order.product_info rescue ''
-      sheet1.row(current_row)[5] = order.order_status
-      sheet1.row(current_row)[6] = (order.order_total_price/100.0).round(2) rescue ''
-      sheet1.row(current_row)[7] = Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M:%S") rescue ''
-      sheet1.row(current_row)[8] = (order.order_express_price/100.0).round(2) rescue ''
-      sheet1.row(current_row)[9] = order.buyer_nick rescue ''
-      sheet1.row(current_row)[10] = order.receiver_name
-      sheet1.row(current_row)[11] = order.receiver_province
-      sheet1.row(current_row)[12] = order.receiver_city
-      sheet1.row(current_row)[13] = order.receiver_zone
-      sheet1.row(current_row)[14] = order.receiver_address
-      sheet1.row(current_row)[15] = order.receiver_mobile
-      sheet1.row(current_row)[16] = order.receiver_phone
-      sheet1.row(current_row)[17] = order.product_name
-      sheet1.row(current_row)[18] = (order.product_price/100.0).round(2) rescue ''
-      sheet1.row(current_row)[19] = order.product_sku
-      sheet1.row(current_row)[20] = order.product_count
-      sheet1.row(current_row)[21] = order.product_img
-      sheet1.row(current_row)[22] = order.delivery_id
-      sheet1.row(current_row)[23] = self::DELIVERY_COMPANY[order.delivery_company]||order.delivery_company rescue ''
-      sheet1.row(current_row)[24] = order.trans_id
-      sheet1.row(current_row)[25] = order.openid
-      sheet1.row(current_row)[26] = order.weixin_public_account.name
+      wx_user = order.weixin_user
+      is_fan =  if !wx_user.blank? && wx_user.subscribe == 1
+                  '是'
+                else
+                  '否'
+                end
+      sheet1.row(current_row).push (begin order.product.name rescue '' end),
+                                   order.product_count,
+                                   order.receiver_name,
+                                   order.receiver_mobile,
+                                   order.delivery_company,
+                                   order.delivery_id,
+                                   order.buyer_nick,
+                                   order.order_id,
+                                   order.receiver_phone,
+                                   order.receiver_province,
+                                   order.receiver_city,
+                                   order.receiver_zone,
+                                   order.receiver_address,
+                                   is_fan,
+                                   Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M:%S"),
+                                   order.order_express_price.to_f/100,
+                                   order.order_total_price.to_f/100
       current_row += 1
     end
     dir = Rails.root.join('public', 'downloads')
@@ -288,4 +266,87 @@ class EricWeixin::Xiaodian::Order < ActiveRecord::Base
     file_path
   end
 
+
+  # order查询,支持以下参数:
+  #   start_date, end_date  起始日期, 终止日期
+  #   buyer_nick 买家昵称
+  #   receiver_name 收货人姓名
+  #   receiver_mobile 收货人手机
+  #   deliver_status 发货状态, (1-未发货, 2-已发货)
+  #   delivery_id 快递单号
+  #   receiver_address 地址
+  #   receiver_city  城市
+  def self.order_query options
+    orders = self.all
+    orders = orders.where("order_create_time >= ?", options[:start_date].to_time.change(hour:0,min:0,sec:0).to_i) unless options[:start_date].blank?
+    orders = orders.where("order_create_time <= ?", options[:end_date].to_time.change(hour:23,min:59,sec:59).to_i) unless options[:end_date].blank?
+    orders = orders.where("buyer_nick LIKE ?", "%#{options[:buyer_nick]}%") unless options[:buyer_nick].blank?
+    orders = orders.where("receiver_name LIKE ?", "%#{options[:receiver_name]}%") unless options[:receiver_name].blank?
+    orders = orders.where("receiver_mobile = ?", options[:receiver_mobile]) unless options[:receiver_mobile].blank?
+    orders = orders.where("delivery_id like ?", "%#{options[:delivery_id]}%") unless options[:delivery_id].blank?
+    orders = orders.where("receiver_address like ?", "%#{options[:receiver_address]}%") unless options[:receiver_address].blank?
+    orders = orders.where("receiver_city like ?", "%#{options[:receiver_city]}%") unless options[:receiver_city].blank?
+    orders = orders.where("delivery_id is null or delivery_id = '' or delivery_company is null or delivery_company = '' ") if options[:deliver_status] == 1.to_s
+    orders = orders.where("delivery_id is not null and delivery_id <> '' and delivery_company is not null and delivery_company <> '' ") if options[:deliver_status] == 2.to_s
+    orders
+  end
+
+  # 通过excel文件更新微信小店订单快递信息，包括快递公司与快递单号
+  def self.update_delivery_info_by_excel file
+    self.transaction do
+      Spreadsheet.client_encoding = 'UTF-8'
+      dir = 'public/temp'
+      Dir.mkdir dir unless Dir.exist? dir
+      path = Rails.root.join(dir, file.original_filename)
+      File.open(path, 'wb') do |f|
+        f.write(file.read)
+      end
+      book = Spreadsheet.open path
+      sheet = book.worksheet 0
+
+      # 遍历到订单ID列
+      order_id_col = -1
+      delivery_company_col = -1
+      delivery_order_id_col = -1
+      100.times do |i|
+        order_id_col = i if sheet.row(0)[i] == '订单ID'
+        delivery_company_col = i if sheet.row(0)[i] == '快递公司'
+        delivery_order_id_col = i if sheet.row(0)[i] == '快递单号'
+        break if order_id_col != -1 && delivery_company_col != -1 && delivery_order_id_col != -1
+      end
+
+      BusinessException.raise '请确保excel文件第一列包含以下列名：订单ID、快递公司、快递单号' if order_id_col == -1 || delivery_company_col == -1 || delivery_order_id_col == -1
+      success_count = 0
+      total_count = 0
+      sheet.each_with_index do |row, index|
+        next if index == 0
+        total_count += 1
+        # 以下几种情况会跳过
+        # * 订单ID不正确
+        # * 没有快递公司
+        # * 没有快递单号
+        # * 数据库中快递小店订单的快递公司已经存在
+        # * 数据库中快递小店订单的快递单号已经存在
+        order_id = row[order_id_col]
+        xiaodian_order = self.find_by_order_id(order_id)
+        next if xiaodian_order.blank?
+        next if row[delivery_company_col].blank? || row[delivery_order_id_col].blank?
+        next if !xiaodian_order.delivery_company.blank? || !xiaodian_order.delivery_id.blank?
+
+        # 过五关、斩六将后，终于可以更新快递信息了
+        delivery_order_id = row[delivery_order_id_col].is_a?(Float) ? row[delivery_order_id_col].to_i.to_s : row[delivery_order_id_col].to_s
+        options = {
+            "delivery_company" => row[delivery_company_col].to_s,
+            "delivery_track_no" => delivery_order_id,
+            "need_delivery" => 1,
+            "is_others" => 1
+        }
+        result = xiaodian_order.set_delivery options
+        success_count += 1 if result
+      end
+      # 删除临时文件
+      File.delete path
+      "共#{total_count}条记录，更新成功#{success_count}条。"
+    end
+  end
 end

data/app/views/eric_weixin/cms/weixin/url_encodes/index.html.erb

@@ -13,10 +13,10 @@
         <% end %>
       </select>
       <%= f.check_box :details, checked: "checked" %>
-      <span>以snsapi_base为scope发起的网页授权</span>
+      <span>以snsapi_userinfo为scope发起的网页授权</span>
       <input type="submit" name="commit" class="button right" value="生成微信授权链接"><br>
       <%= f.check_box :only_id %>
-      <span>以snsapi_userinfo为scope发起的网页授权</span><hr/>
+      <span>以snsapi_base为scope发起的网页授权</span><hr/>
     <% end %>
     <%= form_for(cms_weixin_url_encodes_path, remote: true) do |f|%>
       <%= f.label :微信公众号 %>

data/app/views/eric_weixin/cms/weixin/weixin_users/index.html.erb

@@ -1,3 +1,9 @@
+<% EricWeixin::PublicAccount.all.each do |pa| %>
+    <%= link_to "快速更新#{pa.name}微信用户信息", "/eric_weixin/cms/weixin/weixin_users/quick_get_user_infos?public_account_id=#{pa.id}", class: 'button tiny' %>
+<% end %><br/>
+<% EricWeixin::PublicAccount.all.each do |pa| %>
+    <%= link_to "批量更新#{pa.name}微信用户信息", "/eric_weixin/cms/weixin/weixin_users/batch_update_user_infos?public_account_id=#{pa.id}", class: 'button tiny' %>
+<% end %>
 <h3>用户表</h3>
 <%= form_tag '/eric_weixin/cms/weixin/weixin_users', method: :get do %>
     <div class="row">

data/app/views/eric_weixin/cms/weixin/xiaodian/orders/index.html.erb

@@ -1,46 +1,100 @@
+<% EricWeixin::PublicAccount.all.each do |pa| %>
+    <%= link_to "更新#{pa.name}红包信息", "/eric_weixin/cms/weixin/xiaodian/orders/update_hb_infos?public_account_id=#{pa.id}", class: 'button tiny' %>
+<% end %>
+<%= link_to "更新本月的订单", "/eric_weixin/cms/weixin/xiaodian/orders/update_order_infos", class: 'button tiny' %>
+<%= form_tag "/eric_weixin/cms/weixin/xiaodian/orders/", method: :get do %>
 <div class="row">
-  <%= form_tag "/eric_weixin/cms/weixin/xiaodian/orders/", method: :get do %>
+  <div class="columns small-2">
+  <label class="inline text-right">时间区间</label>
+</div>
+  <div class="columns small-2">
+    <%= date_field_tag :start_date, params[:start_date] %>
+  </div>
+  <div class="columns small-2 text-center">
+    <label class="inline center">至</label>
+  </div>
+  <div class="columns small-2 end">
+    <%= date_field_tag :end_date, params[:end_date] %>
+  </div>
+  <div class="columns small-2">
+    <label class="inline text-right">发货状态</label>
+  </div>
+  <div class="columns small-2">
+    <%= select_tag :deliver_status, options_for_select({ '未发货' => 1, '已发货' => 2}, params[:deliver_status]), prompt: '全部' %>
+    <%#= check_box_tag :need_deliver, '1', params[:commit]!='查询'&&params[:need_deliver].blank? ? true : params[:need_deliver]=='1' %><!--<label class="inline small-3">需要发货</label>-->
+  </div>
+</div>
+<div class="row">
+  <div class="columns small-2">
+    <label class="inline text-right">昵称</label>
+  </div>
+  <div class="columns small-2">
+    <%= text_field_tag :buyer_nick, params[:buyer_nick] %>
+  </div>
+  <div class="columns small-2">
+    <label class="inline text-right">收货人姓名</label>
+  </div>
+  <div class="columns small-2">
+    <%= text_field_tag :receiver_name, params[:receiver_name] %>
+  </div>
+  <div class="columns small-2">
+    <label class="inline text-right">手机号</label>
+  </div>
+  <div class="columns small-2">
+    <%= text_field_tag :receiver_mobile, params[:receiver_mobile] %>
+  </div>
+</div>
+    <div class="row">
+      <div class="columns small-2">
+        <label class="inline text-right">快递单号</label>
+      </div>
       <div class="columns small-2">
-        <label class="inline text-right">订单时间区间</label>
+        <%= text_field_tag :delivery_id, params[:delivery_id] %>
       </div>
-      <div class="columns small-3">
-        <%= date_field_tag :start_date, params[:start_date] %>
+      <div class="columns small-2">
+        <label class="inline text-right">城市</label>
       </div>
-      <div class="columns small-1 text-center">
-        <label class="inline center">至</label>
+      <div class="columns small-2">
+        <%= text_field_tag :receiver_city, params[:receiver_city] %>
       </div>
-      <div class="columns small-3">
-        <%= date_field_tag :end_date, params[:end_date] %>
+      <div class="columns small-2">
+        <label class="inline text-right">地址</label>
       </div>
-      <div class="columns small-3 text-left">
-        <%= submit_tag '查询', class: "button tiny" %>
+      <div class="columns small-2">
+        <%= text_field_tag :receiver_address, params[:receiver_address] %>
       </div>
+    </div>
+    <div class="row">
+        <div class="columns small-12 text-right">
+          <%= submit_tag '查询', class: 'tiny button' %>
+        </div>
+    </div>
   <% end %>
-</div>
-
 <h3>订单列表</h3>
 微信小店官方物流公司：邮政EMS、申通快递、中通速递、圆通速递、天天快递、顺丰速运、韵达快运、宅急送、汇通快运、易迅快递
-<table>
+<table style="width: 113%; table-layout: auto;" >
   <thead>
     <th>订单ID</th>
 
-    <th>买家</th><th>购买时间</th><th>宝贝</th><th>宝贝信息</th><th>数量</th><th>收货人</th><th>收货地址</th><th>手机</th>
+    <th>昵称</th><th>购买时间</th><th>宝贝</th><th>宝贝信息</th><th>数量</th><th>收货信息</th>
 
-    <th>是否需要物流</th><th>是否官方物流</th><th>快递公司</th><th>运单号</th><th>操作</th>
+    <th>需物流</th><th>官方物流</th><th>快递公司</th><th>运单号</th><th>操作</th>
   </thead>
   <tbody>
     <% @orders.each do |order| %>
         <tr>
           <td style="word-break:break-all"><%= order.order_id %></td>
-          <td style="word-break:break-all"><%= order.weixin_user.nickname rescue '' %></td>
-          <td style="word-break:break-all"><%= Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M:%S") %></td>
-          <td style="word-break:break-all"><%= order.product.name %></td>
+          <td style="word-break:break-all"><%= order.buyer_nick rescue '' %></td>
+          <td style="word-break:break-all"><%= Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M") %></td>
+          <td style="word-break:break-all"><%= order.product.name rescue 'error' %></td>
           <td style="word-break:break-all"><%= order.product_info %></td>
           <td style="word-break:break-all"><%= order.product_count %></td>
-          <td style="word-break:break-all"><%= order.receiver_name %></td>
-          <td style="word-break:break-all"><%= order.receiver_province + order.receiver_city + order.receiver_zone + order.receiver_address %></td>
-          <td style="word-break:break-all"><%= order.receiver_mobile %></td>
           <td style="word-break:break-all">
+            <%= order.receiver_name %>
+            <%= order.receiver_mobile %><br>
+            <%= "#{order.receiver_province}#{order.receiver_city}#{order.receiver_zone}#{order.receiver_address}" %>
+          </td>
+          <td style="word-break:break-all; width:12px">
             <%= check_box_tag "order_#{order.id}_is_need_delivery", "1", true, onchange: "change_need_delivery(#{order.id})" %>
           </td>
           <td id="order_<%= order.id %>_is_xiaodian_delivery_td"  style="word-break:break-all">
@@ -49,13 +103,25 @@
           </td>
           <td id="order_<%= order.id %>_delivery_company_td"  style="word-break:break-all">
             <% if is_xiaodian_delivery %>
-                <%= select_tag "order_#{order.id}_delivery_company", options_from_collection_for_select(EricWeixin::Xiaodian::Order::DELIVERY_COMPANY, 'first', 'second', order.delivery_company), prompt: '选择快递公司' %>
+              <%= select_tag "order_#{order.id}_delivery_company", options_from_collection_for_select(EricWeixin::Xiaodian::Order::DELIVERY_COMPANY, 'first', 'second', order.delivery_company), prompt: '选择快递公司' %>
+            <% elsif order.delivery_company.blank? %>
+              <%= text_field_tag "order_#{order.id}_delivery_company" %>
             <% else %>
+              <span id="<%= order.id %>_delivery_com_show" onclick="update_delivery('<%=order.id %>');"><%= order.delivery_company %></span>
+              <span id="<%= order.id %>_delivery_com_input_span" style="display: none">
                 <%= text_field_tag "order_#{order.id}_delivery_company", order.delivery_company %>
+              </span>
             <% end %>
           </td>
           <td id="order_<%= order.id %>_deliver_id_td"  style="word-break:break-all">
-            <%= text_field_tag "order_#{order.id}_delivery_id", order.delivery_id %>
+            <% if order.delivery_id.blank? %>
+              <%= text_field_tag "order_#{order.id}_delivery_id" %>
+            <% else %>
+              <span id="<%= order.id %>_delivery_show" onclick="update_delivery('<%=order.id %>');"><%= order.delivery_id %></span>
+              <span id="<%= order.id %>_delivery_input_span" style="display: none">
+                <%= text_field_tag "order_#{order.id}_delivery_id", order.delivery_id %>
+              </span>
+            <% end %>
           </td>
           <td id="order_<%= order.id %>_action_td"  style="word-break:break-all">
             <%= link_to '保存', "javascript:save_delivery_info(#{order.id})", id: "order_#{order.id}_action", class: "button tiny" %>
@@ -67,10 +133,23 @@
 <%= will_paginate @collection, renderer: FoundationPagination::Rails %>
 <div class="row">
   <div class="columns small-12 text-right">
-    <%= link_to '下载订单', "/eric_weixin/cms/weixin/xiaodian/orders/download_orders?start_time=#{params[:start_date]}&end_time=#{params[:end_date]}", class: 'button tiny' %>
+    <%= link_to '下载订单', "/eric_weixin/cms/weixin/xiaodian/orders/download_orders?start_time=#{params[:start_date]}&end_time=#{params[:end_date]}&deliver_status=#{params[:deliver_status]}&buyer_nick=#{params[:buyer_nick]}&receiver_name=#{params[:receiver_name]}&receiver_mobile=#{params[:receiver_mobile]}", class: 'button tiny' %>
   </div>
 </div>
 
+<%= form_tag '/eric_weixin/cms/weixin/xiaodian/orders/update_delivery_info_by_excel', multipart: true, method: 'post' do %>
+<div class="row">
+  <div class="columns small-5 text-right">
+    <label class="inline">包含快递单信息的excel文件(仅支持xls格式)</label>
+  </div>
+  <div class="columns small-3">
+    <%= file_field_tag 'file' %>
+  </div>
+  <div class="columns small-4 text-left">
+    <%= submit_tag '更新快递单信息', class: 'button tiny' %>
+  </div>
+</div>
+<% end %>
 <script language="javascript">
   function change_need_delivery(order_id){
     if(!$("#order_"+order_id+"_is_need_delivery")[0].checked){
@@ -104,13 +183,13 @@
   }
   function save_delivery_info(order_id){
       need_delivery = $("#order_"+order_id+"_is_need_delivery")[0].checked ? 1 : 0;
-      is_others = $("#order_"+order_id+"_is_xiaodian_delivery")[0].checked ? 0 : 1;
+//      is_others = $("#order_"+order_id+"_is_xiaodian_delivery")[0].checked ? 0 : 1;
       delivery_track_no = $("#order_"+order_id+"_delivery_id")[0].value;
       delivery_company = $("#order_"+order_id+"_delivery_company")[0].value;
       $.ajax({
           url: '/eric_weixin/cms/weixin/xiaodian/orders/save_delivery_info',
           type: 'post',
-          data: {id: order_id, need_delivery: need_delivery, is_others: is_others, delivery_track_no: delivery_track_no, delivery_company: delivery_company},
+          data: {id: order_id, need_delivery: need_delivery, is_others: 1, delivery_track_no: delivery_track_no, delivery_company: delivery_company},
           async: false
       }).done(
               function(result){
@@ -118,4 +197,10 @@
               }
       );
   }
+  function update_delivery(id) {
+    $("#" + id + "_delivery_show").toggle();
+    $("#" + id + "_delivery_input_span").toggle();
+    $("#" + id + "_delivery_com_show").toggle();
+    $("#" + id + "_delivery_com_input_span").toggle();
+  }
 </script>

data/app/views/eric_weixin/wz/xiaodian/orders/index.html.erb

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>微信小店</title>
+    <%= stylesheet_link_tag    "eric_weixin/application", media: "all" %>
+    <%= javascript_include_tag "eric_weixin/application" %>
+    <%= csrf_meta_tags %>
+
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+    <meta content="telephone=no" name="format-detection">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+  </head>
+  <body>
+    <div class="xiaodian_orders">
+      <% if @orders.blank?  %>
+          <div class="no_xiaodian_order">
+            <div class="no_order_suggestion">
+              您还没有订单 _(:з」∠)_
+
+
+            </div>
+
+          </div>
+      <% else %>
+          <% @orders.each do |order| %>
+              <div class="xiaodian_order">
+
+                <div class="product_info-list">
+                  <div class="product_info-title">
+                    <div class="product_info-name">
+                      <%= order.product_name %>
+                    </div>
+                    <div class="product_info-time">
+                      <%= Time.at(order.order_create_time).strftime("%Y-%m-%d %H:%M") %>
+                    </div>
+                  </div>
+                  <div class="product_info-description">
+                    <div class="product_info-part">
+                      数量：<%= order.product_count %>
+                    </div>
+                    <div class="product_info-part">
+                      <% sku_info = order.sku_info.gsub(/[$]/, '$' => '') unless order.sku_info.blank? %>
+                      <%= "(#{sku_info})" unless order.sku_info.blank? %>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="user_info-list">
+                  <div class="user_info-user">
+                    <div class="user_info-part">
+                      姓名：<%= order.receiver_name %>
+                    </div>
+                    <div class="user_info-part">
+                      手机号：<%= order.receiver_mobile || order.receiver_phone %>
+                    </div>
+                  </div>
+                  <div class="user_info-address">
+                    收货地址：<%= order.receiver_address %>
+                  </div>
+                </div>
+
+
+                <div class="delivery_info-list">
+                  <div class="delivery_info-part">
+                    快递信息：<%= order.delivery_company %>
+                  </div>
+                  <div class="delivery_info-part">
+                    <%= order.delivery_id %>
+                  </div>
+                </div>
+              </div>
+          <% end %>
+
+          <%= will_paginate @collections, renderer: FoundationPagination::Rails %>
+      <% end %>
+
+    </div>
+  </body>
+</html>
+
+
+
+

data/config/initializers/assets.rb

@@ -8,3 +8,4 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.precompile += %w( search.js )
 Rails.application.config.assets.precompile += %w( eric_weixin/cms/base.js )
 Rails.application.config.assets.precompile += %w( eric_weixin/cms/base.css )
+Rails.application.config.assets.precompile += %w( eric_weixin/wz/base.css )