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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ClosedFitting.java

@@ -16,7 +16,9 @@ public class ClosedFitting  implements Serializable {
 
     private Integer closedFittingType;  //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
-    private String fittingName;     //配件名称
+    private String closedFittingsName;     //配件名称
+
+    private String closedFittingsBar;     //配件sku
 
     public Integer getClosedFittingType() {
         return closedFittingType;
@@ -26,12 +28,20 @@ public class ClosedFitting  implements Serializable {
         this.closedFittingType = closedFittingType;
     }
 
-    public String getFittingName() {
-        return fittingName;
+    public String getClosedFittingsName() {
+        return closedFittingsName;
+    }
+
+    public void setClosedFittingsName(String closedFittingsName) {
+        this.closedFittingsName = closedFittingsName;
+    }
+
+    public String getClosedFittingsBar() {
+        return closedFittingsBar;
     }
 
-    public void setFittingName(String fittingName) {
-        this.fittingName = fittingName;
+    public void setClosedFittingsBar(String closedFittingsBar) {
+        this.closedFittingsBar = closedFittingsBar;
     }
 
     public Integer getClosedFittingId() {

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SendFitting.java

@@ -16,14 +16,24 @@ public class SendFitting  implements Serializable {
 
     private Integer sendFittingType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
-    private String sendProductName; //产品名称
+    private String sendFittingsName; //配件名称
 
-    public String getSendProductName() {
-        return sendProductName;
+    private String sendFittingsBar; //配件sku
+
+    public String getSendFittingsName() {
+        return sendFittingsName;
+    }
+
+    public void setSendFittingsName(String sendFittingsName) {
+        this.sendFittingsName = sendFittingsName;
+    }
+
+    public String getSendFittingsBar() {
+        return sendFittingsBar;
     }
 
-    public void setSendProductName(String sendProductName) {
-        this.sendProductName = sendProductName;
+    public void setSendFittingsBar(String sendFittingsBar) {
+        this.sendFittingsBar = sendFittingsBar;
     }
 
     public Integer getSendFittingType() {

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -286,6 +286,8 @@ public class CustomerServiceImpl implements CustomerService {
         for (int i=0;i<cc.getSendFittings().size();i++) {
             FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById( cc.getSendFittings().get(i).getFittingsId());
             cc.getSendFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getSendFittings().get(i).setSendFittingsName(fittingsInfo.getFittingsName());
+            cc.getSendFittings().get(i).setSendFittingsBar(fittingsInfo.getFittingsName());
         }
         for (int i=0;i<cc.getClosedProdcues().size();i++) {
             Product product = productMapper.getProduce(cc.getClosedProdcues().get(i).getProductId());
@@ -298,6 +300,8 @@ public class CustomerServiceImpl implements CustomerService {
         for (int i=0;i<cc.getClosedFittings().size();i++) {
             FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(cc.getClosedFittings().get(i).getFittingsId());
             cc.getClosedFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getClosedFittings().get(i).setClosedFittingsName(fittingsInfo.getFittingsName());
+            cc.getClosedFittings().get(i).setClosedFittingsBar(fittingsInfo.getFittingsName());
         }
     }
 
@@ -381,7 +385,7 @@ public class CustomerServiceImpl implements CustomerService {
                 awaitingSignclosedProductInfo.setProductNum(1);
                 awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
                 awaitingSignclosedProductInfo.setSignclosedProductColor(null);
-                awaitingSignclosedProductInfo.setProductName(closedFitting.getFittingName());       //配件名称
+                awaitingSignclosedProductInfo.setProductName(closedFitting.getClosedFittingsName());       //配件名称
                 awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
             }
         }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -678,7 +678,7 @@ public class AdminCustomerController {
             String result = smsService.sendOtherCMS(phone, text);
 
             if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(500, "添加客诉发送短信失败，失败原因：" + result, 500);
+                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。", 505);
             }
         }
         return new ResponseJson(200, "添加客诉成功!", 200);

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

@@ -691,10 +691,12 @@ public class AdminOrderController {
      */
     @RequestMapping("/download_order_txt")
     public void downloadExcel(@RequestParam("file") String filePath, HttpServletRequest request,HttpServletResponse response) throws Exception {
-        String webPath = request.getSession().getServletContext().getRealPath("");
+        String webPath = request.getSession().getServletContext().getRealPath("/");
         webPath += filePath;
         File file = new File(webPath);
 
+        logger.info("下载交易号，交易号地址：" + file.getPath());
+
         // 设置返回内容
         response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment;filename="+new String(("Efast订单号").getBytes("UTF-8"), "ISO-8859-1") + ".txt");
@@ -714,6 +716,7 @@ public class AdminOrderController {
             output.flush();   //不可少
             response.flushBuffer();//不可少
         } catch (Exception e) {
+            logger.info("保存交易号失败：失败原因：" + e.getMessage());
             //异常自己捕捉
         } finally {
             //关闭流，不可少

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -1993,10 +1993,23 @@
                     var index = layer.alert(data.resultMsg, function () {
                         if (data.resultCode == 200) {
                             location.href = "${path}/admin/customer/select_customer_list";
-                        } else {
+                        } else if(data.resultCode == 505){
+
+                        }else {
                             layer.close(index);
                         }
                     });
+
+//                    layer.confirm(data.resultMsg, {
+//                        btn: ['重要','奇葩'] //按钮
+//                    }, function(){
+//                        layer.msg('的确很重要', {icon: 1});
+//                    }, function(){
+//                        layer.msg('也可以这样', {
+//                            time: 20000, //20s后自动关闭
+//                            btn: ['明白了', '知道了']
+//                        });
+//                    });
                 }
             }
         });
@@ -2004,6 +2017,12 @@
 
     /* 添加客诉的准备 */
     function addCustomerReady(){
+        /* 录入电话号码和姓名到客诉基本信息里面  */
+        var name = $("#sendName").val();
+        var sendTel = $("#sendTel").val();
+        $("#customerName").val(name);
+        $("#customerTel").val(sendTel);
+
 
         /*验证来源入口*/
         var customerSourceType = $("input:radio[name='customerSourceType']:checked").val();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -108,7 +108,7 @@
                         </span>
                     </div>
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
-                        <input type="text" class="input-text" value="" placeholder="订单编号" id="salesId" name="">
+                        <input type="text" class="input-text" value="" placeholder="Efast订单号" id="salesOrderId" name="">
                     </div>
 
                      <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
@@ -137,7 +137,7 @@
                 <tr class="text-c">
                     <th width="50">销售公司</th>
                     <th width="50">店铺名称</th>
-                    <th width="50">订单编号</th>
+                    <th width="50">Efast订单号</th>
                     <th width="100">交易号</th>
                     <th width="60">收货人姓名</th>
                     <th width="80">收货人电话</th>
@@ -319,6 +319,7 @@
         var salesId = convertUndefinedToEmpty($("#salesId").val());
         var salesAddressName =convertUndefinedToEmpty($("#salesAddressName").val());
         var salesAddressTel = convertUndefinedToEmpty($("#salesAddressTel").val());
+        var salesOrderId = convertUndefinedToEmpty($("#salesOrderId").val());
         $.ajax({
             type: "POST",
             data: {
@@ -326,6 +327,7 @@
                 salesStoreId : salesStoreId,
                 salesOrderStatus : salesOrderStatus,
                 salesId : salesId,
+                salesOrderId : salesOrderId,
                 salesAddressName : salesAddressName,
                 salesAddressTel : salesAddressTel
             },
@@ -340,14 +342,14 @@
                         var productsHtml = '';
                         var salesOrderItem = salesOrder.salesOrderItemList
                         for(var j=0;j<salesOrderItem.length;j++){
-                            var item = salesOrderItem[j].itemProductName + "*" + salesOrderItem[j].itemNum;
-                                productsHtml += '<span class="label label-success radius">' + item + '</span>';
+                            var item = interceptToString(salesOrderItem[j].itemProductName) + "*" + salesOrderItem[j].itemNum;
+                                productsHtml += '<span class="label label-success radius" title="'+ salesOrderItem[j].itemProductName +'*'+ salesOrderItem[j].itemNum +'">' + item + '</span>';
                         }
                         var time = formatDate(new Date(salesOrder.salesCreateTime),"yyyy-MM-dd");
                         html += '<tr class="text-c">' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ salesOrder.salesId +'</td>' +
+                                ' <td>'+ salesOrder.salesOrderId +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +

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

@@ -96,6 +96,7 @@
                             <option value="23">简二家</option>
                             <option value="24">科学育儿</option>
                             <option value="25">美康辰</option>
+                            <option value="26">北京悦祺</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -48,6 +48,23 @@ function convertUndefinedToEmpty(val) {
 }
 
 /**
+ * 截取字符串显示
+ * @param val
+ * @param length  长度
+ * @returns {*}
+ */
+function interceptToString(val,length) {
+    var value = convertUndefinedToEmpty(val);
+    if(length == null || length == "" || typeof(val)=="undefined" || parseInt(length) < 1){
+        length = 10;
+    }
+    if( value.length > length){
+        value = value.substring(0,length) + "…";
+    }
+    return value;
+}
+
+/**
  * 去除空格
  * @param str
  * @constructor