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

@@ -962,6 +962,7 @@ public class AdminOrderController {
         Date date = new Date();
         StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(sd_id);
         Map<String,SalesOrder> mapsalesOrderList = new HashMap<>();
+        int newFaultNum = 0;
         if(orderEfasts == null || orderEfasts.size() <= 0) {
             return ResponseJson.SUCCESS;
         }
@@ -1014,7 +1015,7 @@ public class AdminOrderController {
                 //salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
                 salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
                 salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
-                salesOrder.setSalesAddressName(efastOrder.getOrderAddress());
+                salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
                 salesOrder.setSalesAmount(efastOrder.getOrderAmount());
                 salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
                 salesOrder.setSalesPayType(1);
@@ -1078,17 +1079,24 @@ public class AdminOrderController {
                /* return new ResponseJson(200, "SUCCESS", 200)
                         .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
                         .addResponseKeyValue("order_list", salesOrderList);*/
+               if(bl == false){
+                   newFaultNum ++;
+               }
          }
-        if(!bl){
+        /*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).getPlatformOrderId() + "\r\n");
+        if(mapsalesOrderList != null && mapsalesOrderList.size() > 0){
+            /*for (int i = 0; i < mapsalesOrderList.size(); i++) {
+                //Efast升级只取交易号 2018-6-8
+                //sb.append(orderEfasts.get(i).getPlatformOrderId().trim() + "@");
+                //sb.append(orderEfasts.get(i).getOrderId() + "\r\n");
+            }*/
+            for(String key: mapsalesOrderList.keySet()){
+                sb.append(key + "\r\n");
+            }
         }
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String dateString = formatter.format(new Date());
@@ -1108,17 +1116,18 @@ public class AdminOrderController {
 
         logger.info("-------- 推送订单到Efast开始 - Efast个数："+ orderEfasts.size() +"--------");
         // 推送
-        try {
+        /*try {
             efastOrderService.sendOrderInfoToEfast(orderEfasts, null);
         } catch (Exception e) {
             logger.error("", e);
-        }
+        }*/
         logger.info("-------- 推送订单到Efast结束 ---------");
-
         return new ResponseJson(200, "SUCCESS", 200)
                 .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
                 .addResponseKeyValue("order_list", orderEfasts)
-                .addResponseKeyValue("fileName", fileName);
+                .addResponseKeyValue("mapSalesOrderSize",mapsalesOrderList.size())
+                .addResponseKeyValue("fileName", fileName)
+                .addResponseKeyValue("newFaultNum",newFaultNum);
     }
 
     /**

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

@@ -359,6 +359,8 @@
                 var $body = $("#send_tbody");
                 var list = result.returnMsg.order_list;
                 var faultNum = 0;
+                var newFaultNum = result.returnMsg.newFaultNum;
+                var mapSalesOrderSize = result.returnMsg.mapSalesOrderSize;
                 for (var i = 0; i < list.length; i++) {
                     var order = list[i];
                     // 推送失败 展示 颜色
@@ -381,8 +383,8 @@
                             '</tr>');
                 }
                 error_path = result.returnMsg.errorPath;
-                $("#order_total").text(list.length);
-                $("#order_fault_num").text(faultNum);
+                $("#order_total").text(mapSalesOrderSize);
+                $("#order_fault_num").text(newFaultNum);
                 modaldemo();
 
                 var fileName = result.returnMsg.fileName;