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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -74,22 +74,27 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         for (final EfastOrder order : orderList){
             i++ ;
             try {
-                boolean flag = sendExcuteOneOrder(order, itemList);
-                if (flag) {
-                    EfastOrder eo = new EfastOrder();
-                    eo.setOrderId(order_sn);
-                    eo.setOrderDealCode(transactionNumber);
-                    efastOrderList.add(eo);
-
-                    order.setReturnStatus("SUCCESS");
-                    order.setReturnMsg("推送成功");
-                } else {
+                if(order.getReturnStatus() == "error"){  //如果 订单状态为eooor，则直接不推送
                     order.setReturnStatus("FAULT");
-                    order.setReturnMsg("推送失败");
+                    continue;
+                }else{
+                    boolean flag = sendExcuteOneOrder(order, itemList);
+                    if (flag) {
+                        EfastOrder eo = new EfastOrder();
+                        eo.setOrderId(order_sn);
+                        eo.setOrderDealCode(transactionNumber);
+                        efastOrderList.add(eo);
+
+                        order.setReturnStatus("SUCCESS");
+                        order.setReturnMsg("推送成功");
+                    } else {
+                        order.setReturnStatus("FAULT");
+                        order.setReturnMsg("推送失败");
+                    }
+                    logger.error("rst-推送百胜第" + i + "个，订单号-->>" + order.getOrderId()
+                            + "， tel:" + order.getOrderAddressTel()
+                            + "， 姓名:" + order.getOrderAddressName());
                 }
-                logger.error("rst-推送百胜第" + i + "个，订单号-->>" + order.getOrderId()
-                        + "， tel:" + order.getOrderAddressTel()
-                        + "， 姓名:" + order.getOrderAddressName());
             } catch (Exception e) {
                 order.setReturnStatus("FAULT");
                 order.setReturnMsg(e.getMessage());

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

@@ -597,6 +597,7 @@ public class AdminOrderController {
      */
     @RequestMapping("/download_excel")
     public ModelAndView downloadExcel(@RequestParam("file") String filePath, HttpServletRequest request) throws Exception {
+        logger.info("--------下载Efast订单-start-------");
         String webPath = request.getSession().getServletContext().getRealPath("");
         webPath += filePath;
 
@@ -676,6 +677,7 @@ public class AdminOrderController {
         model.put("varList", countexts);
         ObjectExcelView erv = new ObjectExcelView();
         ModelAndView mv = new ModelAndView(erv,model);
+        logger.info("--------下载Efast订单-end-------");
         return mv;
     }
 
@@ -702,7 +704,7 @@ public class AdminOrderController {
                 name= "邮政EMS";
                 break;
             case "eyb":
-                name= "E邮宝";
+                name= "省外EMS";
                 break;
             case "zjs":
                 name= "宅急送";

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -353,7 +353,7 @@ public class ExcelUtil {
                 // 匹配姓名列
                 nameColumnIndex = cell.getColumnIndex();
             } else if (platformOrder.equals(cell.getStringCellValue().trim())) {
-                // 匹配电话
+                // 匹配订单编号
                 platformOrderColumnIndex = cell.getColumnIndex();
             } else if (tel.equals(cell.getStringCellValue().trim())) {
                 // 匹配电话
@@ -392,8 +392,10 @@ public class ExcelUtil {
                 String userTel = getValue(temp.getCell(telColumnIndex)).trim();
                 // 如果手机号码校验不通过，则应该不录入
                 if (!ValidateUtil.checkMobile(userTel)) {
-                    temp.getCell(telColumnIndex).setCellStyle(cellStyle);
-                    continue;
+                    //temp.getCell(telColumnIndex).setCellStyle(cellStyle);
+                    order.setReturnStatus("error");
+                    order.setReturnMsg("手机号码不正确");
+                    //continue;
                 }
                 order.setOrderAddressTel(userTel);                                                         // 读取tel
                 order.setOrderProductBarCode(map.get(getValue(temp.getCell(productColumnIndex))));         // 读取对应的产品id