后台客诉列表增加查看物流信息功能

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

@@ -73,7 +73,9 @@ public class CustomerInfo  implements Serializable {
 
     /*设置客诉列表查询条件*/
     private String sendLogisticsNo;     //寄出物流单号
+    private String sendLogisticsCompany;     //寄出物流公司
     private String backLogisticsNo;     //寄回物流单号
+    private String backLogisticsCompany;     //寄回物流公司
 
     /*关联客诉产品类型*/
     private Integer typeCompany;    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
@@ -592,4 +594,20 @@ public class CustomerInfo  implements Serializable {
     public void setBackLogisticsNo(String backLogisticsNo) {
         this.backLogisticsNo = backLogisticsNo;
     }
+
+    public String getSendLogisticsCompany() {
+        return sendLogisticsCompany;
+    }
+
+    public void setSendLogisticsCompany(String sendLogisticsCompany) {
+        this.sendLogisticsCompany = sendLogisticsCompany;
+    }
+
+    public String getBackLogisticsCompany() {
+        return backLogisticsCompany;
+    }
+
+    public void setBackLogisticsCompany(String backLogisticsCompany) {
+        this.backLogisticsCompany = backLogisticsCompany;
+    }
 }

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

@@ -1058,7 +1058,9 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setSendStatus(renewed.getRenewedSendStatus());
                                 customer.setSalesTime(renewed.getSalesPayTime());
                                 customer.setSendLogisticsNo(renewed.getRenewedSendLogisticsNo());
+                                customer.setSendLogisticsCompany(renewed.getRenewedSendLogisticsCompany());
                                 customer.setBackLogisticsNo(renewed.getRenewedBackLogisticsNo());
+                                customer.setBackLogisticsCompany(renewed.getRenewedBackLogisticsCompany());
                                 break;
                             }
                         }
@@ -1070,7 +1072,9 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setSendStatus(repair.getRepairSendStatus());
                                 customer.setSalesTime(repair.getSalesPayTime());
                                 customer.setSendLogisticsNo(repair.getRepairSendLogisticsNo());
+                                customer.setSendLogisticsCompany(repair.getRepairSendLogisticsCompany());
                                 customer.setBackLogisticsNo(repair.getRepairBackLogisticsNo());
+                                customer.setBackLogisticsCompany(repair.getRepairBackLogisticsCompany());
                                 break;
                             }
                         }
@@ -1081,6 +1085,7 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setSendStatus(reissue.getReissueSendStatus());
                                 customer.setSalesTime(reissue.getSalesPayTime());
                                 customer.setBackLogisticsNo(reissue.getReissueSendLogisticsNo());
+                                customer.setBackLogisticsCompany(reissue.getReissueSendLogisticsCompany());
                                 break;
                             }
                         }
@@ -1101,6 +1106,7 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setBackStatus(noreasonBack.getNoreasonBackBackStatus());
                                 customer.setSalesTime(noreasonBack.getSalesPayTime());
                                 customer.setSendLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
+                                customer.setSendLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
                                 break;
                             }
                         }

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

@@ -377,7 +377,6 @@ public class AdminDetectController {
      *
      * @return
      */
-    @RequiresPermissions("complete:update:complete")
     @RequestMapping(value = "/to_view_logistics")
     public ModelAndView toViewLogistics(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("cm/logistics/view_logistics");

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

@@ -170,10 +170,12 @@
                                 <#if (customer.sendLogisticsNo??) || (customer.backLogisticsNo??)>
 
                                         <#if (customer.backLogisticsNo??)>
-                                            寄回：${customer.backLogisticsNo!''}<br>
+                                            寄回：
+                                            <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${customer.backLogisticsNo!''}&billName=${customer.backLogisticsCompany!''}',500,400);">${customer.backLogisticsNo!''}</a><br>
                                         </#if>
                                         <#if customer.sendLogisticsNo??>
-                                            寄出：${customer.sendLogisticsNo!''}
+                                            寄出：
+                                            <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${customer.sendLogisticsNo!''}&billName=${customer.sendLogisticsCompany!''}',500,400);">${customer.sendLogisticsNo!''}</a><br>
                                         </#if>
                                 <#else>
                                     无
@@ -481,7 +483,10 @@
 
         });
     }
-
+    /*查看物流*/
+    function openLogistics(title, url, w, h) {
+        layer_show(title,url,w,h);
+    }
 </script>
 </body>
 </html>

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

@@ -228,6 +228,9 @@
                         case "longbanwuliu":
                             name= "龙邦快递";
                             break;
+                        case "dbkd":
+                            name= "德邦快递";
+                            break;
                         default:
                             break;
                     }