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

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

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

@@ -151,7 +151,7 @@ public class CustomerServiceImpl implements CustomerService {
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
                     }else{
-                        throw new Exception("换新创建Efast订单失败");
+                        //throw new Exception("换新创建Efast订单失败");
                     }
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     this.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintSignclosedProductInfoMapper.xml

@@ -60,12 +60,12 @@
   <insert id="insertList" parameterType="SignclosedProductInfo" >
     insert into tb_rst_complaint_awaiting_signclosed_product
       (
-          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color,machine_no
+          signclosed_id, product_name,product_num,signclosed_product_type,signclosed_product_id,signclosed_product_color
       )
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
-        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}, #{node.machineNo}
+        #{node.signclosedId}, #{node.productName},#{node.productNum},#{node.signclosedProductType}, #{node.signclosedProductId}, #{node.signclosedProductColor}
       )
     </foreach>
   </insert>

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

@@ -633,10 +633,19 @@ public class AdminCustomerController {
             return new ResponseJson(500, "未获取到产品类型!", 500);
         }
 
+        if(complaintQuestionInfo.getQuestionId() == null){
+            return new ResponseJson(500, "未获取到问题信息或邮寄信息!", 500);
+        }
+
+        flag =  complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
+        if (flag < 1) {
+            return new ResponseJson(500, "问题修改失败!", 500);
+        }
+
         String con = "";
         if(type != null && !"".equals(type)){
             if( "p".equals(type)){
-                url += "/problem?questionId="+complaintQuestionInfo.getQuestionId();
+                url += "/"+complaintQuestionInfo.getQuestionId();
 
                 switch (typeCompany){
                     case 1:
@@ -652,7 +661,7 @@ public class AdminCustomerController {
 
             }else if( "m".equals(type)){
                 complaintQuestionInfo.setQuestionName(null);
-                url += "/address";
+                url += "/5";
 
                 switch (typeCompany){
                     case 1:
@@ -665,16 +674,12 @@ public class AdminCustomerController {
                         con = SmsConfig.SEND_PRODUCT_SEND_YULIA;
                         break;
                 }
-
             }
         }
 
         logger.info("发送短信url地址：" + url);
 
-        flag =  complaintQuestionInfoService.updateQuestionById(complaintQuestionInfo);
-        if (flag < 1) {
-            return new ResponseJson(500, "问题修改失败!", 500);
-        }
+
         String text = MessageFormat.format(con, url);
         String result = smsService.sendOtherCMS(phone, text);
 

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

@@ -5,6 +5,7 @@ import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
@@ -16,7 +17,6 @@ import javax.servlet.http.HttpServletRequest;
  * 问题
  */
 @Controller
-@RequestMapping("/QA")
 public class AppComplaintQuestionInfoController {
 
     /**
@@ -36,12 +36,16 @@ public class AppComplaintQuestionInfoController {
      * @return
      * @throws Exception
      */
-    @RequestMapping("/problem")
-    public ModelAndView problem(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/request_message");
-        String questionId = request.getParameter("questionId");
-        mv.addObject("questionId", questionId);
-        return mv;
+    @RequestMapping("/QA/{id}")
+    public ModelAndView problem( @PathVariable("id") Integer id, HttpServletRequest request) throws Exception {
+        if(id == backOutQuestionId){
+            ModelAndView mv = new ModelAndView("wap/cm/send_message");
+            return mv;
+        }else{
+            ModelAndView mv = new ModelAndView("wap/cm/request_message");
+            mv.addObject("questionId", id);
+            return mv;
+        }
     }
 
     /**
@@ -51,11 +55,11 @@ public class AppComplaintQuestionInfoController {
      * @return
      * @throws Exception
      */
-    @RequestMapping("/address")
-    public ModelAndView adress(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("wap/cm/send_message");
-        return mv;
-    }
+//    @RequestMapping("/address")
+//    public ModelAndView adress(HttpServletRequest request) throws Exception {
+//        ModelAndView mv = new ModelAndView("wap/cm/send_message");
+//        return mv;
+//    }
 
     /**
      * 查询退回短信客诉问题

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

@@ -82,10 +82,9 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>跟进客服：</label>
-                <div class="formControls col-4 col-sm-4"> <span class="select-box">
-				<select name="adminId" id="adminId" class="select">
-
-				</select>
+                <div class="formControls col-4 col-sm-4"> <span class="select-box" style=" width: 625px;">
+                    <select name="adminId" id="adminId" class="select">
+                    </select>
 				</span>
                 </div>
             </div>
@@ -103,7 +102,7 @@
                     <div class="radio-box">
                         <input type="radio" id="tel-3" name="customerSourceType" value="3">
                         <label for="tel-3">其他</label>
-                        <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" value="" placeholder="" id="customerSourceOld" name="customerSourceOld" placeholder="">
+                        <input type="text" style="width: 321px;margin-left: 10px;" class="input-text" value="" placeholder="" id="customerSourceOld" name="customerSourceOld" placeholder="">
                         <input type="hidden" value="" placeholder="" id="customerSource" name="customerSource">
                     </div>
                 </div>
@@ -182,7 +181,7 @@
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题内容：</label>
                 <div class="formControls col-5 col-sm-5">
                     <input type="hidden" name="questionId" id="questionId">
-                    <script id="describeContentText" type="text/plain" style="width:621px;height:250px;"></script>
+                    <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
                     <input type="hidden" name="describeContent" id="describeContent">
                 </div>
@@ -415,7 +414,7 @@
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
                 <div class="formControls col-5 col-sm-5" style="height: 250px">
-                    <script id="sendAddressSms" type="text/plain" style="width:1000px;height:200px;"></script>
+                    <script id="sendAddressSms" type="text/plain" style="width:983px;height:200px;"></script>
                     </script>
                 </div>
             </div>
@@ -453,7 +452,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>处理描述：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <script id="describeHandleDescText" type="text/plain" style="width:1000px;height:250px;"></script>
+                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
                     <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
                 </div>
@@ -578,20 +577,122 @@
         //$("#answer-textarea").text();
         $(".dalog-ask").hide(); //隐藏qa
     });
-
-    /*实时监听文本框-- 员工编号*/
-    document.getElementById("suggest").addEventListener("div", function(){
-        alert(1);
-    });
 </script>
 
 <script>
+
+    var tool = [
+        'anchor', //锚点
+        'undo', //撤销
+        'redo', //重做
+        'bold', //加粗
+        'indent', //首行缩进
+        'snapscreen', //截图
+        'italic', //斜体
+        'underline', //下划线
+        'strikethrough', //删除线
+        'subscript', //下标
+        'fontborder', //字符边框
+        'superscript', //上标
+        'formatmatch', //格式刷
+        //'source', //源代码
+        'blockquote', //引用
+        'pasteplain', //纯文本粘贴模式
+        'selectall', //全选
+        'print', //打印
+        'preview', //预览
+        'horizontal', //分隔线
+        'removeformat', //清除格式
+        'time', //时间
+        'date', //日期
+        'unlink', //取消链接
+        'insertrow', //前插入行
+        'insertcol', //前插入列
+        'mergeright', //右合并单元格
+        'mergedown', //下合并单元格
+        'deleterow', //删除行
+        'deletecol', //删除列
+        'splittorows', //拆分成行
+        'splittocols', //拆分成列
+        'splittocells', //完全拆分单元格
+        'deletecaption', //删除表格标题
+        'inserttitle', //插入标题
+        'mergecells', //合并多个单元格
+        'deletetable', //删除表格
+        'cleardoc', //清空文档
+        'insertparagraphbeforetable', //"表格前插入行"
+        //'insertcode', //代码语言
+        'fontfamily', //字体
+        'fontsize', //字号
+        'paragraph', //段落格式
+        'simpleupload', //单图上传
+        'insertimage', //多图上传
+        'edittable', //表格属性
+        'edittd', //单元格属性
+        'link', //超链接
+        'emotion', //表情
+        'spechars', //特殊字符
+        'searchreplace', //查询替换
+        'map', //Baidu地图
+        'gmap', //Google地图
+        'insertvideo', //视频
+        'help', //帮助
+        'justifyleft', //居左对齐
+        'justifyright', //居右对齐
+        'justifycenter', //居中对齐
+        'justifyjustify', //两端对齐
+        'forecolor', //字体颜色
+        'backcolor', //背景色
+        'insertorderedlist', //有序列表
+        'insertunorderedlist', //无序列表
+        'fullscreen', //全屏
+        'directionalityltr', //从左向右输入
+        'directionalityrtl', //从右向左输入
+        'rowspacingtop', //段前距
+        'rowspacingbottom', //段后距
+        'pagebreak', //分页
+        'insertframe', //插入Iframe
+        'imagenone', //默认
+        'imageleft', //左浮动
+        'imageright', //右浮动
+        'attachment', //附件
+        'imagecenter', //居中
+        'wordimage', //图片转存
+        'lineheight', //行间距
+        'edittip ', //编辑提示
+        'customstyle', //自定义标题
+        'autotypeset', //自动排版
+       // 'webapp', //百度应用
+        'touppercase', //字母大写
+        'tolowercase', //字母小写
+        'background', //背景
+        'template', //模板
+       // 'scrawl', //涂鸦
+        'music', //音乐
+        'inserttable', //插入表格
+        'drafts', // 从草稿箱加载
+        'charts' // 图表
+    ];
+
     /*问题描述*/
-    var describeContentText = UE.getEditor('describeContentText');
+    var describeContentText = UE.getEditor('describeContentText', {
+        toolbars: [tool],
+        autoHeightEnabled: true,
+        autoFloatEnabled: true,
+        zIndex : 5
+    });
     /*处理描述*/
-    var describeHandleDescText = UE.getEditor('describeHandleDescText');
+    var describeHandleDescText = UE.getEditor('describeHandleDescText', {
+        toolbars: [tool],
+        autoHeightEnabled: true,
+        autoFloatEnabled: true
+    });
     /*邮寄地址*/
-    var sendAddressSms = UE.getEditor('sendAddressSms');
+    var sendAddressSms = UE.getEditor('sendAddressSms', {
+        toolbars: [tool],
+        autoHeightEnabled: true,
+        autoFloatEnabled: true
+    });
 
     sendAddressSms.ready(function() {
         sendAddressSms.setHeight(130);  //固定高度
@@ -1159,10 +1260,16 @@
             return false;
         }
 
+        if(desc == null || desc == "" || questionId==null || questionId == ""){
+            layer.close(index);
+            layer.msg("信息不全,无法发送短信", {icon: 5, time: 3000});
+            return false;
+        }
+
         var reg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
         if(!reg.test(phone)){
-            layer.msg("手机号码格式不正确", {icon: 5, time: 3000});
             layer.close(index);
+            layer.msg("手机号码格式不正确", {icon: 5, time: 3000});
             return false;
         }
 
@@ -1255,8 +1362,11 @@
                        //address = '<td colspan="1">收货地址</td><td colspan="6" class="td-manage text-c" >'+ salesOrder.salesAddressInfo +'&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #0a6999;text-decoration: underline;" href="javascript:void(0);" title="编辑" onclick="updateAdress()">修改地址</a></td>' ;
                         address = salesOrder.salesAddressInfo;
 
-                        $("#sendName").val(salesOrder.salesAddressName); //订单名称
-                        $("#sendTel").val(salesOrder.salesAddressTel);  //订单电话号码
+                        $("#sendName").val(salesOrder.salesAddressName); //收件人名称
+                        $("#sendTel").val(salesOrder.salesAddressTel);  //收件人电话号码
+
+                        $("#customerName").val(salesOrder.salesAddressName); //收件人名称
+                        $("#customerTel").val(salesOrder.salesAddressTel);  //收件人电话号码
                     }
                    // $("#showOrderAddress").html(address);
                 }else{
@@ -1339,7 +1449,7 @@
     function setPro(provinceName,type) {
         var proId = '';
         var province = listProvince();
-        var selectPro = {};
+        var selectPro = new Array();
         if(type == 1){
             selectPro = listProvince("",provinceName);
         }else if(type == 2){
@@ -1348,6 +1458,9 @@
         if(province!=null){
             var provinceHtml = ''
             for(var i=0;i<province.length;i++){
+                if(selectPro == null || selectPro.length < 1 || selectPro == undefined || typeof (selectPro.length) == "undefined"){
+                    selectPro.push(province[0]);
+                }
                 if(selectPro!= null && province[i].provinceId == selectPro[0].provinceId){
                     proId = selectPro[0].provinceId;
                     provinceHtml += '<option value="'+ province[i].provinceId +'" selected>'+ province[i].province +'</option>';
@@ -1367,7 +1480,7 @@
     function setCity(cityName,proId,type) {
         var cityId = '';
         var city = listCity(proId,"");
-        var selectCity = {};
+        var selectCity = new Array();
         if(type == 1){
             selectCity = listCity(proId,cityName);
         }else if(type == 2){
@@ -1377,6 +1490,9 @@
 
         if(city!=null){
             var cityHtml = ''
+            if(selectCity == null || selectCity.length < 1 || selectCity == undefined || typeof (selectCity.length) == "undefined"){
+                selectCity.push(city[0]);
+            }
             for(var i=0;i<city.length;i++){
                 if(selectCity != null && city[i].cityId == selectCity[0].cityId){
                     cityId = city[i].cityId;
@@ -1396,7 +1512,7 @@
      */
     function setDistrict(districtName,cityId,type) {
         var district = listDistrict(cityId,"");
-        var selectDistrict = {};
+        var selectDistrict = new Array();
         if(type == 1){
             selectDistrict = listDistrict(cityId,districtName);
         }else if(type == 2){
@@ -1404,6 +1520,9 @@
         }
         if(district!=null){
             var districtHtml = ''
+            if(selectDistrict == null || selectDistrict.length < 1 || selectDistrict == undefined || typeof (selectDistrict.length) == "undefined"){
+                selectDistrict.push(district[0]);
+            }
             for(var i=0;i<district.length;i++){
                 if(selectDistrict != null && district[i].districtId == selectDistrict[0].districtId){
                     districtHtml += '<option value="'+ district[i].districtId +'" selected>'+ district[i].district +'</option>';

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/request_message.ftl

@@ -66,11 +66,11 @@
 <script type="text/javascript" src="${path}/common/lib/mui/js/city.data-3.js"></script>
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
-	var questionId=getQueryString("questionId");
+	var questionId=${questionId ! '1'};
 	//自己写的js
 	mui.ready(function() {
 		if(questionId!=null){
-		$.ajax('${path}/QA/get_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/get_question?dates=' + new Date().getTime(), {
 						data: {
 							"questionId":questionId
 						},
@@ -112,7 +112,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/send_message.ftl

@@ -65,7 +65,7 @@
 <script>
 	//自己写的js
 	mui.ready(function() {
-		$.ajax('${path}/QA/get_back_out_question?dates=' + new Date().getTime(), {
+		$.ajax('${path}/get_back_out_question?dates=' + new Date().getTime(), {
 						data: {},
 						dataType: 'json',
 						xhrFields: {
@@ -103,7 +103,7 @@
 			parameter["questionNotSolvedNum"] = 1;
 		}
 		
-		$.ajax('${path}/QA/update_question_num?dates=' + new Date().getTime(), {
+		$.ajax('${path}/update_question_num?dates=' + new Date().getTime(), {
 						data:parameter,
 						dataType: 'json',
 						xhrFields: {

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

@@ -65,7 +65,7 @@ function Trim(str)
  * @returns {{}}
  */
 function listProvince(provinceId,provinceName){
-    var province = {};
+    var province = new Array();
     $.ajax({
         type: "get",
         data: {
@@ -93,7 +93,7 @@ function listProvince(provinceId,provinceName){
  * 获取市
  */
 function listCity(provinceId,cityName){
-    var city = {};
+    var city = new Array();
     $.ajax({
         type: "get",
         data: {
@@ -119,7 +119,7 @@ function listCity(provinceId,cityName){
  * 获取区
  */
 function listDistrict(cityId,districtName){
-    var district = {};
+    var district = new Array();
     $.ajax({
         type: "get",
         data: {