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

@@ -967,8 +967,8 @@ public class AdminOrderController {
         }
         for (EfastOrder efastOrder: orderEfasts) {
             String orderId = efastOrder.getPlatformOrderId();
-            SalesOrder order = mapsalesOrderList.get(orderId);
-            if (order == null) {
+            salesOrder = mapsalesOrderList.get(orderId);
+            if (salesOrder == null) {
                 // 没有订单
                 salesOrderList = new ArrayList<SalesOrder>();
                 salesOrderItemList = new ArrayList<SalesOrderItem>();
@@ -1043,29 +1043,37 @@ public class AdminOrderController {
                 salesOrderList.add(salesOrder);
                 mapsalesOrderList.put(orderId, salesOrder);
             } else {
-                salesOrder.setSalesDealCode(orderId);
+                //salesOrder.setSalesDealCode(orderId);
                 // 有订单，合并到原有订单的订单项
                 salesOrderItem = new SalesOrderItem();
-                salesOrderItem.setItemColorId(productColor.getColorId());
-                if (product != null) {
-                    salesOrderItem.setItemProductId(product.getProductId());
-                    salesOrderItem.setItemProductType(product.getProductType());
+                productColor = new ProductColor();
+                productColor.setColorBar(efastOrder.getOrderProductBarCode());
+                listColor = productService.listproductAndColor(productColor);
+                if (listColor != null && listColor.size() > 0) {
+                    productColor = listColor.get(0);
+                    product = productService.getProductById(listColor.get(0).getColorId());
+                    if (product != null) {
+                        salesOrderItem.setItemProductId(product.getProductId());
+                        salesOrderItem.setItemProductType(product.getProductType());
+                    }
+                    salesOrderItem.setItemColorId(productColor.getColorId());
+                    salesOrderItem.setItemNum(efastOrder.getOrderNum());
+                    salesOrderItem.setItemProductName(productColor.getProductName());
+                    salesOrderItem.setItemProductPic(productColor.getColorPicture());
+                    salesOrderItem.setItemProductColor(productColor.getColorName());
+                    salesOrderItem.setItemColorBar(productColor.getColorBar());
+                    salesOrderItem.setItemProductPrice(productColor.getColorPrice());
+                    salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+                    salesOrderItem.setItemIsSource(1);
                 }
-                salesOrderItem.setItemNum(efastOrder.getOrderNum());
-                salesOrderItem.setItemProductName(productColor.getProductName());
-                salesOrderItem.setItemProductPic(productColor.getColorPicture());
-                salesOrderItem.setItemProductColor(productColor.getColorName());
-                salesOrderItem.setItemColorBar(productColor.getColorBar());
-                salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
-                salesOrderItem.setItemIsSource(1);
-                order.getSalesOrderItemList().add(salesOrderItem);
+                salesOrder.getSalesOrderItemList().add(salesOrderItem);
+                //salesOrder.setSalesDealCode(orderId);
                 mapsalesOrderList.put(orderId, salesOrder);
             }
         }
 
-         for(SalesOrder SalesOrder: mapsalesOrderList.values()){
-                bl = salesOrderService.addRstOrderAndIteminfo(SalesOrder);
+         for(SalesOrder salesOrders: mapsalesOrderList.values()){
+                bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
                /* return new ResponseJson(200, "SUCCESS", 200)
                         .addResponseKeyValue("errorPath", request.getContextPath() + filePath)