客诉上线

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

@@ -17,6 +17,7 @@ import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -423,7 +424,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(visitAdminId)) {
             return new ResponseJson(500, "请选择回访人!", 500);
         }
-        visit.setAdminId(Integer.parseInt(visitAdminId));
+        Integer loginAdminId = AdminUtils.getLoginAdminId();
+        visit.setAdminId(loginAdminId);
+        visit.setDesignatedAdminId(Integer.parseInt(visitAdminId));
         visit.setVisitStatus(1);
         visit.setVisitCreateTime(new Date());
         int num = visitService.addVisitInfo(visit, visit.getCustomerId());
@@ -759,6 +762,8 @@ public class AdminCustomerController {
             }
         }
 
+        String userPhone = encodePhoneNumber(phone);
+
         String text = MessageFormat.format(con, url);
         logger.info("给 " + phone + " 手机用户发送短信：" + text);
         String result = smsService.sendOtherCMS(phone, text);
@@ -770,6 +775,25 @@ public class AdminCustomerController {
         }
     }
 
+    String encodePhoneNumber(String number)
+    {
+        int encnum = Integer.parseInt(number.substring(2));
+
+        int prefix = (number.charAt(1) - '2') /2;   // '3'=>0, '5'=>1, '[67]'=>2, '8'=>3
+
+        encnum |= (prefix <<= 30);
+
+        final byte[] raw = new byte[4];
+
+        raw[0] = (byte)(encnum >>> 24);
+        raw[1] = (byte)(encnum >>> 16);
+        raw[2] = (byte)(encnum >>> 8);
+        raw[3] = (byte) encnum;
+
+        return Base64.encodeBase64URLSafeString(raw);
+    }
+
+
     /**
      * 进入回访完成页面
      *

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -107,7 +107,7 @@ public class MQTask implements InitializingBean {
 	}
 
 	/**
-	 * 批量同步百胜订单信息
+	 * 批量同步百胜订单信息 -- 客诉系统
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次

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

@@ -556,9 +556,14 @@
 
     $(document).on('click', '.dalog-ask .answer', function() {
 
-        var questionId = $(this).find(".quesId").val()
+        var QA_complaintId = $(this).find(".QA_complaintId").val();
+        var QA_smallClassId = $(this).find(".QA_smallClassId").val();
+        $("select[name='complaintId']").val(QA_complaintId);
+        initComplaintSmallClassInfo(QA_complaintId,QA_smallClassId); //初始化小类
+
+        var questionId = $(this).find(".quesId").val();
         var title = $(this).find("span").html();
-        var desc = $(this).find("#questionProfile").html()
+        var desc = $(this).find("#questionProfile").html();
 
         $("#questionId").val(questionId);
         $("#describeTitle").val(title);
@@ -1249,7 +1254,7 @@
     }
 
     /*显示小类*/
-    function initComplaintSmallClassInfo(complaintId){
+    function initComplaintSmallClassInfo(complaintId,smallId){
         if(complaintId == null || complaintId == ""){
             var html = '<option value="">请选择问题小类</option>';
             $("[name='smallClassId']").html(html);
@@ -1272,6 +1277,10 @@
                         html = '';
                     }
                     $("[name='smallClassId']").html(html);
+
+                    if(smallId != null && smallId != "" && typeof(smallId)!="undefined" ){
+                        $("select[name='smallClassId']").val(smallId);
+                    }
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
                 }
@@ -1321,6 +1330,8 @@
                             //        '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span><input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'"></li>';
                             html += '' +
                                     '<li class="answer" style="height: 20px;overflow: hidden;border-bottom: 1px solid #ddd;"><span>'+ complaintQuestion.questionName +'</span>' +
+                                    '<input class="QA_complaintId" type="hidden" value="'+ complaintQuestion.complaintId +'">' +
+                                    '<input class="QA_smallClassId" type="hidden" value="'+ complaintQuestion.smallClassId +'">' +
                                     '<input class="quesId" type="hidden" value="'+ complaintQuestion.questionId +'">' +
                                     '<div id="questionProfile" style="display: block">'+ complaintQuestion.questionProfile +'</div>' +
                                     '</li>';

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

@@ -81,14 +81,14 @@
                     var visit = data.returnMsg.visit;
                     if (visit.designatedAdminId != null && visit.designatedAdminId != 'undefined') {
                         if (visit.adminId == visit.designatedAdminId) {
-                            $('#adminName').html(visit.adminName+"(自己指定)");
+                            $('#adminName').html(visit.designatedAdminName+"(自己指定)");
                         } else {
-                            $('#adminName').html(visit.adminName+"("+visit.designatedAdminName+"指定)");
+                            $('#adminName').html(visit.designatedAdminName+"("+visit.adminName+"指定)");
                         }
                     } else {
-                        $('#adminName').html(visit.adminName);
+                        $('#adminName').html(visit.designatedAdminName);
                     }
-
+                    // 1：未回访，2：已回访
                     if (num == 1) {
                         $('#txtVisitCompleteDate').html(visit.visitDate);
                         $('#txtVisitCompleteName').html(visit.visitName);

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

@@ -44,7 +44,7 @@
 
     <div class="cl bg-1 bk-gray " style="margin-top: 20px;">
         <span class="l" style="margin-left: 10px; height: 30px;line-height: 30px;font-weight: bold;">
-           合计共收到多少个客诉问题：<span id="allNumber">0</span>
+           合计共收到<span id="allNumber">0</span>个客诉问题
         </span>
     </div>
     <div class="mt-20" id="createTable" style="margin-top: 0px;">
@@ -126,7 +126,7 @@
                 var tbody_array = new Array();
                 table_fmt.creat_table(arrayTile,typeList,null,num);
 
-                $("#allNumber").html(data.returnMsg.num);
+                $("#allNumber").html("&nbsp;"+data.returnMsg.num+"&nbsp;");
 
                 layer.close(index);
             },