Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

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

@@ -663,10 +663,11 @@ public class AdminOrderController {
                 }
             }*/
             //List<SalesOrder> temporarySalesOrderList = new ArrayList<SalesOrder>();
+            //添加子订单
             if(salesOrderList != null && salesOrderList.size() > 0) {
                 for (SalesOrder salesOrder : salesOrderList) {
                     int salesId = salesOrder.getSalesId();
-                    List<SalesOrder> salesMainOrderList = orderService.querySalesOrderItemListBySalesId(salesId);
+                    List<SalesOrder> salesMainOrderList = orderService.querySalesOrderItemListBySalesId(salesId);//查询子订单
                     if(salesMainOrderList != null && salesMainOrderList.size() > 0){
                         for(SalesOrder salesMainOrder:salesMainOrderList){
                             temporarySalesOrderList.add(salesMainOrder);
@@ -674,13 +675,13 @@ public class AdminOrderController {
                     }
                 }
             }
-            if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
-                if(salesOrderList != null && salesOrderList.size() > 0) {
-                    for (SalesOrder salesOrder : salesOrderList) {
-                        temporarySalesOrderList.add(salesOrder);
-                    }
+            //添加主订单
+            if(salesOrderList != null && salesOrderList.size() > 0) {
+                for (SalesOrder salesOrder : salesOrderList) {
+                    temporarySalesOrderList.add(salesOrder);
                 }
             }
+
             /*if(efastOrder != null){
                 efastOrderList.get(i).setOrderAddressName(efastOrder.getOrderAddressName());
                 efastOrderList.get(i).setOrderAddressTel(efastOrder.getOrderAddressTel());