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

@@ -966,7 +966,7 @@ public class AdminOrderController {
             return ResponseJson.SUCCESS;
         }
         for (EfastOrder efastOrder: orderEfasts) {
-            String orderId = efastOrder.getOrderId();
+            String orderId = efastOrder.getPlatformOrderId();
             SalesOrder order = mapsalesOrderList.get(orderId);
             if (order == null) {
                 // 没有订单
@@ -992,8 +992,8 @@ public class AdminOrderController {
                         salesOrderItem.setItemProductId(product.getProductId());
                         salesOrderItem.setItemProductType(product.getProductType());
                     }
-                    /*salesOrderItem.setItemProductName(product.getProductName());*/
                     salesOrderItem.setItemNum(efastOrder.getOrderNum());
+                    salesOrderItem.setItemProductName(product.getProductName());
                     salesOrderItem.setItemProductPic(productColor.getColorPicture());
                     salesOrderItem.setItemProductColor(productColor.getColorName());
                     salesOrderItem.setItemColorBar(productColor.getColorBar());
@@ -1029,7 +1029,8 @@ public class AdminOrderController {
                 salesOrder.setSalesStoreId(storeInfo.getStoreId());
                 salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
                 salesOrder.setSalesType(1);
-                salesOrder.setSalesDealCode(String.valueOf(efastOrder.getOid()));
+                //salesOrder.setSalesDealCode(String.valueOf(efastOrder.getOid()));
+                salesOrder.setSalesDealCode(orderId);
                 salesOrder.setSalesOrderStatus(1);
                 salesOrder.setSalesShippingStatus(0);
                 salesOrder.setSalesPayStatus(2);
@@ -1049,6 +1050,8 @@ public class AdminOrderController {
                     salesOrderItem.setItemProductId(product.getProductId());
                     salesOrderItem.setItemProductType(product.getProductType());
                 }
+                salesOrderItem.setItemNum(efastOrder.getOrderNum());
+                salesOrderItem.setItemProductName(productColor.getProductName());
                 salesOrderItem.setItemProductPic(productColor.getColorPicture());
                 salesOrderItem.setItemProductColor(productColor.getColorName());
                 salesOrderItem.setItemColorBar(productColor.getColorBar());
@@ -1063,17 +1066,20 @@ public class AdminOrderController {
          for(SalesOrder SalesOrder: mapsalesOrderList.values()){
                 bl = salesOrderService.addRstOrderAndIteminfo(SalesOrder);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
-                return new ResponseJson(200, "SUCCESS", 200)
+               /* return new ResponseJson(200, "SUCCESS", 200)
                         .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
-                        .addResponseKeyValue("order_list", salesOrderList);
+                        .addResponseKeyValue("order_list", salesOrderList);*/
          }
+        if(!bl){
+            return ResponseJson.SUCCESS;
+        }
         //Efast升级 2018-6-8
-
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < orderEfasts.size(); i++) {
             //Efast升级只取交易号 2018-6-8
             //sb.append(orderEfasts.get(i).getPlatformOrderId().trim() + "@");
-            sb.append(orderEfasts.get(i).getOrderId() + "\r\n");
+            //sb.append(orderEfasts.get(i).getOrderId() + "\r\n");
+            sb.append(orderEfasts.get(i).getPlatformOrderId() + "\r\n");
         }
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String dateString = formatter.format(new Date());