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

@@ -993,6 +993,7 @@ public class AdminOrderController {
                         salesOrderItem.setItemProductType(product.getProductType());
                     }
                     /*salesOrderItem.setItemProductName(product.getProductName());*/
+                    salesOrderItem.setItemNum(efastOrder.getOrderNum());
                     salesOrderItem.setItemProductPic(productColor.getColorPicture());
                     salesOrderItem.setItemProductColor(productColor.getColorName());
                     salesOrderItem.setItemColorBar(productColor.getColorBar());
@@ -1028,7 +1029,7 @@ public class AdminOrderController {
                 salesOrder.setSalesStoreId(storeInfo.getStoreId());
                 salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
                 salesOrder.setSalesType(1);
-                salesOrder.setSalesDealCode(efastOrder.getOrderDealCode());
+                salesOrder.setSalesDealCode(String.valueOf(efastOrder.getOid()));
                 salesOrder.setSalesOrderStatus(1);
                 salesOrder.setSalesShippingStatus(0);
                 salesOrder.setSalesPayStatus(2);