修改客诉详情

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

@@ -12,6 +12,7 @@ import java.util.List;
 /**
  * 退货
  */
+@Deprecated
 public class BackGoods  implements Serializable {
     private static final long serialVersionUID = -6844954322262497132L;
     private Integer backGoodsId;

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

@@ -2,6 +2,7 @@ package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
 
+@Deprecated
 public class ClosedFitting  implements Serializable {
     private static final long serialVersionUID = 8778123739128123226L;
     private Integer closedFittingId;

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

@@ -100,6 +100,9 @@ public class CmRelation implements  Serializable{
     private Integer procMethodIsBack; //处理方式名称1:需要寄回 2:不需要寄回
     private Integer procMethodIsSend; //处理方式名称1:需要寄出 2:不需要寄出
 
+    private String procMethodName; //处理方式名称
+    private String procTypeName; //处理方式类型名称
+
 
     public Integer getRelationId(){
         return relationId;
@@ -404,4 +407,20 @@ public class CmRelation implements  Serializable{
     public void setProcMethodIsSend(Integer procMethodIsSend) {
         this.procMethodIsSend = procMethodIsSend;
     }
+
+    public String getProcMethodName() {
+        return procMethodName;
+    }
+
+    public void setProcMethodName(String procMethodName) {
+        this.procMethodName = procMethodName;
+    }
+
+    public String getProcTypeName() {
+        return procTypeName;
+    }
+
+    public void setProcTypeName(String procTypeName) {
+        this.procTypeName = procTypeName;
+    }
 }

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

@@ -10,6 +10,7 @@ import java.util.List;
 /**
  * wxm 客诉处理公共类
  */
+@Deprecated
 public class CustomerCommon implements Serializable {
 
     private static final long serialVersionUID = -4259088710780733418L;

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

@@ -160,9 +160,13 @@ public class CustomerInfo  implements Serializable {
     private Integer procMethodIsSend; //处理方式名称1:需要寄出 2:不需要寄出
 
 
+    //以下为TDS的信息区域值
     private String customerProvinceId;    //省
     private String customerCityId;    //市
     private String customerDistrictId;    //区
+    private String customerProvinceName;    //省
+    private String customerCityName;    //市
+    private String customerDistrictName;    //区
     private String customerSendAddress;    //详细地址
     private List<PostageInfo> postageInfoList;    //邮费集合
     private List<SendbackInfo> sendbackInfoList;    //寄回信息集合
@@ -853,4 +857,28 @@ public class CustomerInfo  implements Serializable {
     public void setCustomerSendAddress(String customerSendAddress) {
         this.customerSendAddress = customerSendAddress;
     }
+
+    public String getCustomerProvinceName() {
+        return customerProvinceName;
+    }
+
+    public void setCustomerProvinceName(String customerProvinceName) {
+        this.customerProvinceName = customerProvinceName;
+    }
+
+    public String getCustomerCityName() {
+        return customerCityName;
+    }
+
+    public void setCustomerCityName(String customerCityName) {
+        this.customerCityName = customerCityName;
+    }
+
+    public String getCustomerDistrictName() {
+        return customerDistrictName;
+    }
+
+    public void setCustomerDistrictName(String customerDistrictName) {
+        this.customerDistrictName = customerDistrictName;
+    }
 }

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

@@ -7,6 +7,7 @@ import java.util.Date;
  * 客诉配件实体类
  * Created by liuzhiwei on 2017/10/31.
  */
+@Deprecated
 public class FittingsInfo implements Serializable {
 
     private static final long serialVersionUID = -1370229485119071783L;

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

@@ -12,6 +12,7 @@ import java.util.List;
 /**
  * 无理由退货
  */
+@Deprecated
 public class NoreasonBack  implements Serializable {
     private static final long serialVersionUID = -8771772978569981906L;
     private Integer noreasonBackId;

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

@@ -11,6 +11,7 @@ import java.util.List;
 /**
  * 售后补发
  */
+@Deprecated
 public class Reissue  implements Serializable {
 
     private static final long serialVersionUID = 6552482836665728058L;

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

@@ -12,6 +12,7 @@ import java.util.List;
 /**
  * 售后换新主键
  */
+@Deprecated
 public class Renewed  implements Serializable {
 
     private static final long serialVersionUID = -4562997728567506919L;

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

@@ -12,6 +12,7 @@ import java.util.List;
 /**
  * 售后维修表
  */
+@Deprecated
 public class Repair implements Serializable {
 
     private static final long serialVersionUID = 6499911867888249040L;

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

@@ -259,6 +259,9 @@
     c.customer_wechat_name,
     c.customer_source_type,
     c.customer_source,
+    c.customer_province_id as customerProvinceId,
+    c.customer_city_id as customerCityId,
+    c.customer_district_id as customerDistrictId,
     ct.complaint_class_name,
     csc.small_class_name,
     t.type_name,
@@ -291,9 +294,6 @@
     cc.customerIsSolve as customerIsSolve,
     cc.procMethodIsBack as procMethodIsBack,
     cc.procMethodIsSend as procMethodIsSend,
-    cc.provinceNumber as customerProvinceId,
-    cc.cityNumber as customerCityId,
-    cc.areaNumber as customerDistrictId,
     cc.relationSendAddress as customerSendAddress
     FROM
     tb_rst_cm_customer_info c
@@ -1093,7 +1093,9 @@ LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
     cr.*,
     sx.sendback_status AS relationBackStatus,
     cpm.proc_method_is_back AS procMethodIsBack,
-    cpm.proc_method_is_send AS procMethodIsSend
+    cpm.proc_method_is_send AS procMethodIsSend,
+    cpm.proc_method_name AS procMethodName,
+    cpt.proc_type_name AS procTypeName
     FROM
     tb_rst_cm_relation cr
     LEFT JOIN (

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

@@ -1,5 +1,8 @@
 package com.iamberry.rst.controllers.cm;
 
+import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
+import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
 import com.iamberry.rst.core.fm.ComplaintSmallClassInfo;
@@ -580,6 +583,24 @@ public class AdminCustomerController {
         cmRelation.setCustomerId(customerInfo.getCustomerId());
         cmRelation = customerService.getCmRelationInfo(cmRelation);
         ProcMethod procMethod = customerService.getProcMethod(cmRelation.getProcMethodId());
+
+        CustomerInfo ci = (CustomerInfo) map.get("customer");
+        if(ci != null){
+            Province province = new Province();
+            province.setProvinceId(Integer.valueOf(ci.getCustomerProvinceId()));
+            List<Province> provinceList = addressService.listProvince(province);
+            ci.setCustomerProvinceName(provinceList.get(0).getProvince());
+
+            City city = new City();
+            city.setCityId(Integer.valueOf(ci.getCustomerCityId()));
+            List<City>  cityList = addressService.listCity(city);
+            ci.setCustomerCityName(cityList.get(0).getCity());
+
+            District district = new District();
+            district.setDistrictId(Integer.valueOf(ci.getCustomerDistrictId()));
+            List<District> districtList = addressService.listDistrict(district);
+            ci.setCustomerCityName(districtList.get(0).getDistrict());
+        }
         rj.addResponseKeyValue("cmRelation", cmRelation);
         rj.addResponseKeyValue("procMethod", procMethod);
         rj.addResponseKeyValue("customerCommon", map.get("customerCommon"));

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

@@ -80,8 +80,8 @@
                 <th width="10">跟进客服：</th>
                 <td width="10" style="font-weight: normal;"><span id="adminName"></span></td>
                 <td width="10"></td>
-                <th width="10">来源入口：</th>
-                <td width="10" style="font-weight: normal;"><span id="customerSourceType"></span></td>
+                <th width="10">处理类型：</th>
+                <td width="10" style="font-weight: normal;"><span id="procMethodName"></span></td>
             </tr>
             <tr>
                 <th width="10">咨询类型：</th>
@@ -90,6 +90,20 @@
                 <th width="10">产品类别：</th>
                 <td width="10" style="font-weight: normal;"><span id="typeName"></span></td>
             </tr>
+            <tr>
+                <th width="10">销售公司：</th>
+                <td width="10" style="font-weight: normal;"><span id="companyName"></span></td>
+                <td width="10"></td>
+                <th width="10">店铺：</th>
+                <td width="10" style="font-weight: normal;"><span id="storeName"></span></td>
+            </tr>
+            <tr>
+                <th width="10">来源入口：</th>
+                <td width="10" style="font-weight: normal;"><span id="customerSourceType"></span></td>
+                <td width="10"></td>
+                <th width="10">来源描述：</th>
+                <td width="10" style="font-weight: normal;"><span id="customerSource"></span></td>
+            </tr>
             </thead>
         </table>
 
@@ -102,13 +116,7 @@
         </div>
         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
             <thead>
-            <tr>
-                <th width="10">销售公司：</th>
-                <td width="10" style="font-weight: normal;"><span id="companyName"></span></td>
-                <td width="10"></td>
-                <th width="10">店铺：</th>
-                <td width="10" style="font-weight: normal;"><span id="storeName"></span></td>
-            </tr>
+
             <tr>
                 <th width="10">微信昵称：</th>
                 <td width="10" style="font-weight: normal;"><span id="customerWechatName"></span></td>
@@ -135,6 +143,13 @@
         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
+                <th width="10">开箱损：</th>
+                <td width="10" style="font-weight: normal;"><span id="customerOutDamaged"></span></td>
+                <td width="10"></td>
+                <th width="10">二次售后：</th>
+                <td width="10" style="font-weight: normal;"><span id="customerSecondaryCustomer"></span></td>
+            </tr>
+            <tr>
                 <th width="10">客诉问题：</th>
                 <td width="10" style="font-weight: normal;"><span id="describeTitle"></span></td>
                 <td width="10"></td>
@@ -150,6 +165,33 @@
             </tr>
             </thead>
         </table>
+
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">TDS收集</div>
+            </label>
+            <div class="formControls col-9">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+                <tr>
+                    <th width="10">所在省份：</th>
+                    <td width="10" style="font-weight: normal;"><span id="customerOutDamaged"></span></td>
+                    <td width="10"></td>
+                    <th width="10">城市区域：</th>
+                    <td width="10" style="font-weight: normal;"><span id="customerSecondaryCustomer"></span></td>
+                </tr>
+                <tr>
+                    <th width="10">进水TDS：</th>
+                    <td width="10" style="font-weight: normal;"><span id="describeTitle"></span></td>
+                    <td width="10"></td>
+                    <th width="10">出水TDS：</th>
+                    <td width="10" style="font-weight: normal;"><span id="questionProfile"></span></td>
+                </tr>
+            </thead>
+        </table>
+
         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
@@ -519,46 +561,63 @@
                     var cmRelation = data.returnMsg.cmRelation;
                     var procMethod = data.returnMsg.procMethod;
 
-                    /*if (customer.customerIsSolve != 1 && customer.customerIsSolve != 2) {*/
-                        /*resultshow(customer.customerIsSolve, customerCommon.relationBackStatus,customerCommon.relationSendStatus,
-                                customerCommon.maintenanceIsRepair,customerCommon.detectState);*/
-                        var postage = '';
-                        var postageMoney = 0;
-                        if (customerCommon.relationBackPostage != null) {
-                            postageMoney = customerCommon.relationBackPostage;
-                        }
-                        switch (customerCommon.relationIsTransfer) {
-                            case 0:
-                                postage = '不需要转账。';
-                                break;
-                            case 1:
-                                postage = '已转账邮费'+postageMoney/100+'元。';
-                                break;
-                            case 2:
-                                postage = '待转账邮费'+postageMoney/100+'元。';
-                                break;
-                        }
-                        $('#postage').html(postage);
-                    /*}*/
+
+                    var postage = '';
+                    var postageMoney = 0;
+                    if (customerCommon.relationBackPostage != null) {
+                        postageMoney = customerCommon.relationBackPostage;
+                    }
+                    switch (customerCommon.relationIsTransfer) {
+                        case 0:
+                            postage = '不需要转账。';
+                            break;
+                        case 1:
+                            postage = '已转账邮费'+postageMoney/100+'元。';
+                            break;
+                        case 2:
+                            postage = '待转账邮费'+postageMoney/100+'元。';
+                            break;
+                    }
+                    $('#postage').html(postage);
 
                     $('#adminName').html(customer.adminName);
                     var customerSource = '';
                     switch (customer.customerSourceType) {
                         case 1:customerSource = '400电话';break;
                         case 2:customerSource = '微信公众号';break;
-                        case 3:customerSource = customer.customerSource;break;
+                        case 3:customerSource = '其他';break;
                         case 4:customerSource = "QQ群";break;
                         case 5:customerSource = "微信群";break;
                         case 6:customerSource = "个人微信";break;
                         case 7:customerSource = "有赞";break;
                     }
                     $('#customerSourceType').html(customerSource);
+                    $('#customerSource').html(customer.customerSource);
+
                     var customerCounsel = '';
                     switch (customer.customerCounselType) {
                         case 1:customerCounsel = '售前咨询';break;
                         case 2:customerCounsel = '售后咨询';break;
                         case 3:customerCounsel = '其他';break;
                     }
+
+                    var customerOutDamagedHtml = '';
+                    if(customer.customerOutDamaged == 1){
+                        customerOutDamagedHtml = '是';
+                    }else{
+                        customerOutDamagedHtml = '否';
+                    }
+                    $("#customerOutDamaged").html(customerOutDamagedHtml);
+
+                    var customerSecondaryCustomerHtml = '';
+                    if(customer.customerSecondaryCustomer == 1){
+                        customerSecondaryCustomerHtml = '是';
+                    }else{
+                        customerSecondaryCustomerHtml = '否';
+                    }
+                    $("#customerSecondaryCustomer").html(customerSecondaryCustomerHtml);
+
+                    $("#procMethodName").html(cmRelation.procTypeName + "(" + cmRelation.procMethodName +")");
                     $('#customerCounselType').html(customerCounsel);
                     $('#typeName').html(customer.typeName);
                     $('#describeTitle').html(customer.describeTitle);