客诉列表修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -194,4 +194,22 @@ public interface CustomerService {
      * @return
      */
     List<ReturnStatisticsInfo> salesReturnForSecond(SalesOrder salesOrder);
+
+    /**
+     * 查询所有处理类型
+     * @return
+     */
+    List<ProcType> listProcType();
+
+    /**
+     * 根据处理类型查询处理方式
+     * @return
+     */
+    List<ProcMethod> listProcMethod(Integer procTypeId);
+
+    /**
+     * 根据id查询处理方式
+     * @return
+     */
+    ProcMethod getProcMethod(Integer procMethodId);
 }

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

@@ -1116,6 +1116,21 @@ public class CustomerServiceImpl implements CustomerService {
         return customerInfoMapper.salesReturnForSecond(salesOrder);
     }
 
+    @Override
+    public List<ProcType> listProcType() {
+        return customerInfoMapper.listProcType();
+    }
+
+    @Override
+    public List<ProcMethod> listProcMethod(Integer procTypeId) {
+        return customerInfoMapper.listProcMethod(procTypeId);
+    }
+
+    @Override
+    public ProcMethod getProcMethod(Integer procMethodId) {
+        return customerInfoMapper.getProcMethod(procMethodId);
+    }
+
     /**
          * 向Efast推送订单--添加订单
          * @return

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

@@ -1,9 +1,6 @@
 package com.iamberry.rst.service.cm.mapper;
 
-import com.iamberry.rst.core.cm.CustomerInfo;
-import com.iamberry.rst.core.cm.CustomerStatisticalInfo;
-import com.iamberry.rst.core.cm.ReturnStatisticsInfo;
-import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.*;
 import com.iamberry.rst.core.order.ProductType;
 
 import java.util.List;
@@ -87,4 +84,22 @@ public interface CustomerInfoMapper {
      * @return
      */
     List<ReturnStatisticsInfo> salesReturnForSecond(SalesOrder salesOrder);
+
+    /**
+     * 查询所有处理类型
+     * @return
+     */
+    List<ProcType> listProcType();
+
+    /**
+     * 根据处理类型查询处理方式
+     * @return
+     */
+    List<ProcMethod> listProcMethod(Integer procTypeId);
+
+    /**
+     * 根据id查询处理方式
+     * @return
+     */
+    ProcMethod getProcMethod(Integer procMethodId);
 }

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

@@ -382,39 +382,15 @@
       <if test="backStatus != null and backStatus != ''">
         and c.customer_id in (
         SELECT customer_id
-        FROM tb_rst_renewed trr
-        WHERE renewed_back_status = #{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_repair
-        WHERE repair_back_status =#{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_back_goods
-        WHERE back_goods_back_status = #{backStatus}
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_noreason_back
-        WHERE noreason_back_back_status = #{backStatus}
+        FROM tb_rst_cm_relation trr
+        WHERE relation_back_status = #{backStatus}
         )
       </if>
       <if test="backStatus == 1">
         and c.customer_id in (
         SELECT customer_id
-        FROM tb_rst_renewed trr
-        WHERE DATEDIFF(NOW(), renewed_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_repair
-        WHERE DATEDIFF(NOW(), repair_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_back_goods
-        WHERE DATEDIFF(NOW(), back_goods_create_time) &gt; 3
-        UNION ALL
-        SELECT customer_id
-        FROM tb_rst_noreason_back
-        WHERE DATEDIFF(NOW(), noreason_back_create_time) &gt; 3
+        FROM tb_rst_cm_relation trr
+        WHERE DATEDIFF(NOW(), relation_create_time) &gt; 3
         )
       </if>
     </where>
@@ -930,5 +906,16 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
     MONTH (salesExchange.sales_create_time)
   </select>
   <!-- 退换货统计sql end -->
-
+  <!-- 查询所有处理类型-->
+  <select id="listProcType" resultType="ProcType">
+    SELECT * from tb_rst_cm_proc_type
+  </select>
+  <!-- 根据处理类型查询处理方式-->
+  <select id="listProcMethod" parameterType="Integer" resultType="ProcMethod">
+    SELECT * from tb_rst_cm_proc_method WHERE proc_type_id = #{procTypeId}
+  </select>
+  <!-- 根据id查询处理方式-->
+  <select id="getProcMethod" parameterType="Integer" resultType="ProcMethod">
+    SELECT * from tb_rst_cm_proc_method WHERE proc_method_id = #{procMethodId}
+  </select>
 </mapper>

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

@@ -595,6 +595,8 @@ public class AdminCustomerController {
         List<ComplaintTypeInfo> complaintTypeList = complaintTypeInfoService.listComplaintTypeInfo(new ComplaintTypeInfo());
         //查询客诉类型集合
         List<ComplaintSmallClassInfo> complaintSmallClassInfoList = complaintSmallClassInfoService.listComplaintSmallClassInfo(new ComplaintSmallClassInfo());
+        //查询处理类型
+        List<ProcType> procTypeList = customerService.listProcType();
 
         //查询问题集合   第 30 条bug
 //        List<QuestionDescribe> questionDescribeList = questionDescribeService.listQuestionDescribe(new QuestionDescribe());
@@ -612,6 +614,7 @@ public class AdminCustomerController {
         mv.addObject("typeList", typeList);
         mv.addObject("complaintTypeList", complaintTypeList);
         mv.addObject("adminList", adminList);
+        mv.addObject("procTypeList", procTypeList);
         customerInfo.setVisit(null);
         customerInfo.setCustomerCommon(null);
         customerInfo.setComplaintDetectList(null);

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

@@ -49,13 +49,18 @@
 
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="margin-left: 50px;height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value="">处理结果</option>
-                <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
+                <#if procTypeList?? &&  (procTypeList?size > 0) >
+                    <#list procTypeList as type>
+                        <option value ="${type.procTypeId!}" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve ==type.procTypeId >selected="selected"</#if></#if>>${type.procTypeName!}</option>
+                    </#list>
+                </#if>
+                <#--<option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
                 <option value="2" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 2 >selected="selected"</#if></#if>>未解决</option>
                 <option value="3" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 3 >selected="selected"</#if></#if>>换新</option>
                 <option value="4" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 4 >selected="selected"</#if></#if>>维修</option>
                 <option value="5" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 5 >selected="selected"</#if></#if>>补发</option>
                 <option value="6" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 6 >selected="selected"</#if></#if>>退货</option>
-                <option value="7" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 7 >selected="selected"</#if></#if>>无理由退货</option>
+                <option value="7" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 7 >selected="selected"</#if></#if>>无理由退货</option>-->
             </select>
 
             <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
@@ -221,12 +226,8 @@
                                 </#if>
                             </td>
                             <td id="txt_customerIsSolve">
-                                <#if customer.customerIsSolve == 1>
-                                    已解决
-                                <#elseif customer.customerIsSolve == 2>
-                                    未解决
-                                <#elseif customer.customerIsSolve == 3>
-                                    换新(
+                                <#if customer.backLogisticsNo??>
+                                ${customer.procMethodName!''}(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRenewed(${customer.customerId!''})">
                                         <font color=#06c>
                                             <#if customer.backStatus??>
@@ -236,6 +237,8 @@
                                                     已寄回
                                                 <#elseif customer.backStatus == 3>
                                                     已收货
+                                                <#elseif customer.backStatus == 4>
+                                                    已签收待确认
                                                 </#if>,
                                             </#if>
                                             <#if customer.sendStatus??>
@@ -266,7 +269,7 @@
                                         </font>
                                     </a>
                                     )
-                                <#elseif customer.customerIsSolve == 4>
+                                <#--<#elseif customer.customerIsSolve == 4>
                                     维修(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRepair(${customer.customerId!''})">
                                         <font color=#06c>
@@ -289,7 +292,7 @@
                                                 </#if>
                                             </#if>
 
-                                        <#--,
+                                        &lt;#&ndash;,
                                             <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                                 <#list customer.complaintDetectList as complaintDetect>
                                                     <#if (complaintDetect_index = 0)>
@@ -304,7 +307,7 @@
                                                         </#if>
                                                     </#if>
                                                 </#list>
-                                            </#if>--></font>
+                                            </#if>&ndash;&gt;</font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 5>
@@ -354,7 +357,7 @@
                                             </#if>
                                         </font>
                                     </a>
-                                    )
+                                    )-->
                                 </#if>
                             </td>
                             <#--<td>