客诉bug修改

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

@@ -676,6 +676,7 @@ public class AdminCustomerController {
         ResponseJson rj = new ResponseJson(200, "修改成功!", 200);
         Integer adminId = AdminUtils.getLoginAdminId();
         Admin admin = new Admin();
+        admin.setAdminDept(3);
         admin.setAdminStatus(1);
         List<Admin> adminList = sysService.listSelectAdmin(admin);
         if (adminList.size() > 0) {
@@ -992,7 +993,7 @@ public class AdminCustomerController {
                         return new ResponseJson(500, "问题修改失败!", 500);
                     }
                 }
-                url += "/" + complaintQuestionInfo.getQuestionId();
+                url += "/" + complaintQuestionInfo.getQuestionId()+"/"+typeCompany;
                 switch (typeCompany) {
                     case 1:
                         con = SmsConfig.SEND_PRODUCT_SEND_WATERO;

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

@@ -36,14 +36,15 @@ public class AppComplaintQuestionInfoController {
      * @return
      * @throws Exception
      */
-    @RequestMapping("/QA/{id}")
-    public ModelAndView problem( @PathVariable("id") Integer id, HttpServletRequest request) throws Exception {
+    @RequestMapping("/QA/{id}/{type}")
+    public ModelAndView problem( @PathVariable("id") Integer id,@PathVariable("type") Integer type, 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);
+            mv.addObject("type", type);
             return mv;
         }
     }

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

@@ -88,6 +88,9 @@ public class KuaiDi100 {
           case "dbkd":
               code = "debangwuliu";
               break;
+          case "lianhaowuliu":
+              code = "lianhaowuliu";
+              break;
       }
     return code;
   }

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

@@ -131,6 +131,23 @@
                     </div>-->
                 </div>
             </div>
+            <div class="row cl" id="salesChannelsSelect" style="display: none">
+                <input type="hidden" id="companyId" name="companyId" value="" >
+                <input type="hidden" id="storeId" name="storeId" value="" >
+                <label class="form-label col-1 col-sm-1">销售渠道：</label>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectCompany" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectStore" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+            </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">客户信息：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -273,6 +290,16 @@
                     </div>
                 </div>
             </div>
+             <div class="row cl">
+              <#--客服备注-->
+                 <label class="form-label col-1 col-sm-1">备注：</label>
+                    <div class="formControls col-5 col-sm-5">
+                    <script id="" type="text/plain" style="width:983px;height:250px;"></script>
+                    </script>
+                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
+                            </div>
+                            </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-10 col-sm-10">
@@ -318,23 +345,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="salesChannelsSelect" style="display: none">
-                <input type="hidden" id="companyId" name="companyId" value="" >
-                <input type="hidden" id="storeId" name="storeId" value="" >
-                <label class="form-label col-1 col-sm-1">销售渠道：</label>
-                <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                         <select id="selectCompany" class="select" name="">
-                         </select>
-                     </span>
-                </div>
-                <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                         <select id="selectStore" class="select" name="">
-                         </select>
-                     </span>
-                </div>
-            </div>
+
 
             <div class="row cl" id="recipientInfoTitle" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>

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

@@ -86,7 +86,7 @@
                 <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
             </select>
             <select class="my-select" name="adminId" style="height: 36px;width: 120px;margin: 0px;">
-                <option value ="">跟进客服</option>
+                <option value ="">全部跟进客服</option>
                 <#if adminList?? &&  (adminList?size > 0) >
                     <#list adminList as admin>
                         <option value ="${admin.adminId!}" <#if customerInfo.adminId??><#if customerInfo.adminId ==admin.adminId >selected="selected"</#if></#if>>${admin.adminName!}</option>
@@ -94,7 +94,7 @@
                 </#if>
             </select>
             <select class="my-select" name="visitDesignatedAdminId" style="height: 36px;width: 120px;margin: 0px;">
-                <option value ="">回访客服</option>
+                <option value ="">全部回访客服</option>
                 <#if adminList?? &&  (adminList?size > 0) >
                     <#list adminList as admin>
                         <option value ="${admin.adminId!}" <#if customerInfo.visitDesignatedAdminId??><#if customerInfo.visitDesignatedAdminId ==admin.adminId >selected="selected"</#if></#if>>${admin.adminName!}</option>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/logistics/view_logistics.ftl

@@ -231,6 +231,9 @@
                         case "dbkd":
                             name= "德邦快递";
                             break;
+                        case "lianhaowuliu":
+                            name= "联昊通";
+                            break;
                         default:
                             break;
                     }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_report.ftl

@@ -271,7 +271,7 @@
                                     tb_array.push(question.questionName);
                                     tb_array.push(question.questionId);
                                     tb_array.push(question.questionNum);
-                                    var n = (Math.round((question.questionNum/allNum) * 10000)/100).toFixed(2) + '%';
+                                    var n = (Math.round((question.questionNum/allTableArray[i].complaintNum) * 10000)/100).toFixed(2) + '%';
                                     tb_array.push(n);
                                     table_array.push(tb_array);
                                 }

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

@@ -50,7 +50,7 @@
 		<p>如因问题对您的生活造成影响，敬请谅解！我们会持续改进，为您提供更好的服务！</p>
 	</div>
 			<div style="padding:20px 0 35px 0;text-align: center;border-bottom: 1px solid #ccc;margin-bottom:10px;">
-			售后热线：<a href="tel:4008006692">400-800-6692</a>
+			售后热线：<a href="tel:4008006692"><span id="telId">400-800-6692</span></a>
 		</div>
 		<div style="text-align: center;">
 			<p>以上信息是否解决了您的问题？</p>
@@ -67,6 +67,20 @@
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script>
 	var questionId=${questionId ! '1'};
+	var type=${type ! '1'};
+
+	if(type == 2){
+	    $("#telId").html("400—678-1860");
+	}
+	if(type == 1){
+	    $("#telId").html("400-800-6692");
+	}
+	if(type == 4){
+	    $("#telId").html("400-800-6692");
+	}
+	if(type == 3){
+	    $("#telId").html("400-600-7719");
+	}
 	//自己写的js
 	mui.ready(function() {
 		if(questionId!=null){

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

@@ -326,7 +326,7 @@ function showVisitMsg(type,adminName) {
 
 function getSysAdmin(){
     if(sysAminList != null && sysAminList.length > 0){
-        return sysAminList
+        return sysAminList;
     }
     $.ajax({
         type: "POST",