订单打印

watero-common-tool/src/main/java/com/iamberry/wechat/tools/AddrUtil.java

@@ -1,8 +1,9 @@
 package com.iamberry.wechat.tools;
 
-//import org.jsoup.Jsoup;
-//import org.jsoup.nodes.Document;
-//import org.jsoup.select.Elements;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -61,9 +62,9 @@ public class AddrUtil {
 	public static String getPostCode(String addr) {
 		try {
 			String url = "http://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&rsv_idx=1&tn=baidu&wd=" + URLEncoder.encode(addr + "邮编", "UTF-8");
-//			Document doc = Jsoup.parse(HttpClient431Util.doGet(null, url));
-//			Elements rows = doc.select(".op_exactqa_s_answer");
-//			return rows.text().trim();
+			Document doc = Jsoup.parse(HttpClient431Util.doGet(null, url));
+			Elements rows = doc.select(".op_exactqa_s_answer");
+			return rows.text().trim();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl

@@ -85,8 +85,8 @@
                                         确认订单
                                     </a>
                                 </#if>
-                                <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="分配快递方式"onclick="distribution_postFirm('分配快递方式','${path}/admin/order_batch/to_distribution_postFirm?batchId=${batch.batchId!''}','570','450');">
-                                    分配快递方式
+                                <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="分配物流"onclick="distribution_postFirm('分配物流','${path}/admin/order_batch/to_distribution_postFirm?batchId=${batch.batchId!''}','570','450');">
+                                    分配物流
                                 </a>
                             </td>
                         </tr>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -111,7 +111,7 @@
                 <th width="50">是否付款</th>-->
                 <th width="50">用户备注</th>
                 <th width="50">后台备注</th>
-                <th width="60">创建时间</th>
+                <th width="65">创建时间</th>
                 <th width="50">操作</th>
             </tr>
             </thead>
@@ -233,7 +233,10 @@
                     <td>${order.salesUserRemark!''}</td>
                     <td>${order.salesAdminRemark!''}</td>
 
-                    <td>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                    <td>
+                        ${(order.salesCreateTime?string("yyyy-MM-dd"))!''}</br>
+                        ${(order.salesCreateTime?string("HH:mm:ss"))!''}
+                    </td>
                     <td>
                         <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="sales_order_detail(${order.salesId!''})">
                             <font color=#06c>详情</font>
@@ -250,8 +253,8 @@
                             </a><br/>
                         </#if>
 
-                        <a style="text-decoration:none" href="javascript:void(0);" title="分配发货方式" onclick="distribution_express(${order.salesId!''})">
-                            <font color=#06c>分配发货方式</font>
+                        <a style="text-decoration:none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
+                            <font color=#06c>分配物流</font>
                         </a><br/>
                     </td>
                 </tr>
@@ -266,7 +269,7 @@
             <div style="float: left;margin-top: 20px;">
                 <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="noticeDistribution()">通知配货</button>
                 <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配快递公司</button>
+                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
             </div>
         </#if>