优化订单详情的功能。

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -262,6 +262,9 @@ public class AdminSalesOrderController {
         mv.addObject("listTracking",listTracking);
         mv.addObject("listOrderCorrectInfo",listOrderCorrectInfo);
         mv.addObject("order",order);
+        if (order.getOrderCaseDate() != null && order.getSalesSignTime() != null) {
+            mv.addObject("distanceTime",DateTimeUtil.getDistanceTime(order.getOrderCaseDate(), order.getSalesSignTime()));
+        }
         return mv;
     }
 

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

@@ -134,7 +134,9 @@
 
                 <td width="10"></td>
                 <th width="10">下单日期：</th>
-                <td width="10" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
+                <td width="10" style="font-weight: normal;">
+                    <span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span>
+                </td>
             </tr>
             </thead>
         </table>
@@ -253,8 +255,8 @@
                     备货中
                 </#if></span></td>
                 <td width="10"></td>
-                <th width="10">发货时间：</th>
-                <td width="10" style="font-weight: normal;"><span>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</span></td>
+                <th width="10">邮费成本：</th>
+                <td width="10" style="font-weight: normal;"><#if order.salesPostageCost??>${order.salesPostageCost/100}元</#if></td>
             </tr>
             <tr>
                 <th width="10">物流公司：</th>
@@ -266,22 +268,42 @@
                 <th width="10">物流单号：</th>
                 <td width="10" style="font-weight: normal;"><span>
                 ${order.salesPostNum!'暂无快递单号'}
-                <#if order.salesPostNum??>
-                    <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${order.salesPostNum!''}&billName=${order.salesPostFirm!''}',600,500);">查看物流</a>
-                </#if>
+                    <#--<#if order.salesPostNum??>
+                        <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${order.salesPostNum!''}&billName=${order.salesPostFirm!''}',600,500);">查看物流</a>
+                    </#if>-->
                 </span></td>
             </tr>
 
             <tr>
-                <th width="10">邮费成本：</th>
-                <td width="10" style="font-weight: normal;"><#if order.salesPostageCost??>${order.salesPostageCost/100}元</#if></td>
+                <th width="10">通知配货：</th>
+                <td width="10" style="font-weight: normal;">
+                    <#if (order.salesDistributionTime)??>
+                        ${(order.salesDistributionTime?string("yyyy-MM-dd HH:mm:ss"))!}
+                    </#if>
+                </td>
+                <td width="10"></td>
+                <th width="10">打单时间：</th>
+                <td width="10" style="font-weight: normal;">
+                    <span>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</span>
+                </td>
+            </tr>
+            <tr>
+                <th width="10">出库时间：</th>
+                <td width="10" style="font-weight: normal;">
+                    <#if (order.salesDeliverTime)??>
+                        ${(order.salesDeliverTime?string("yyyy-MM-dd HH:mm:ss"))!}
+                    </#if>
+                </td>
                 <td width="10"></td>
                 <th width="10">揽件时间：</th>
                 <td width="10" style="font-weight: normal;"><#if order.orderCaseDate??>${order.orderCaseDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
             </tr>
             <tr>
                 <th width="10">签收时间：</th>
-                <td width="10" colspan="4" style="font-weight: normal;"><#if (order.salesSignTime)??>${order.salesSignTime?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+                <td width="10" style="font-weight: normal;"><#if (order.salesSignTime)??>${order.salesSignTime?string("yyyy-MM-dd HH:mm:ss")}</td>
+                <td width="10"></td>
+                <th width="10">运输耗时：</th>
+                <td width="10" style="font-weight: normal;"><#if distanceTime??>&nbsp;${(distanceTime)!}</#if></#if></td>
             </tr>
             </thead>
         </table>