wangxiaoming 7 سال پیش
والد
کامیت
9ae6d3a0ed

+ 30 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Postage.java

@@ -32,6 +32,8 @@ public class Postage implements Serializable {
     private String postageLogisticsCompany;
     //退回快递编号
     private String postageLogisticsNo;
+    //详细地址
+    private String postageClientAddress;
     //退款金额
     private Integer postageAmount;
     //支付宝账户
@@ -42,6 +44,10 @@ public class Postage implements Serializable {
     private Date postageCreateTime;
 
     private Date postageUpdateTime;
+    //客服姓名
+    private String adminName;
+    //销售来源名称
+    private String storeName;
 
     public Integer getPostageId() {
         return postageId;
@@ -178,4 +184,28 @@ public class Postage implements Serializable {
     public void setPostageUpdateTime(Date postageUpdateTime) {
         this.postageUpdateTime = postageUpdateTime;
     }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getPostageClientAddress() {
+        return postageClientAddress;
+    }
+
+    public void setPostageClientAddress(String postageClientAddress) {
+        this.postageClientAddress = postageClientAddress;
+    }
 }

+ 9 - 2
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/PostageServiceImpl.java

@@ -1,12 +1,17 @@
 package com.iamberry.rst.service.cm;
 
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.CustomerInfo;
 import com.iamberry.rst.core.cm.Postage;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.cm.PostageService;
 import com.iamberry.rst.service.cm.mapper.PostageMapper;
+import com.iamberry.rst.util.PageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class PostageServiceImpl implements PostageService {
     @Autowired
@@ -19,11 +24,13 @@ public class PostageServiceImpl implements PostageService {
 
     @Override
     public Integer updatePostage(Postage postage) {
-        return null;
+        return postageMapper.updatePostage(postage);
     }
 
     @Override
     public PagedResult<Postage> listPostage(int pageNO, int pageSize, Postage postage, boolean isTotalNum) {
-        return null;
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        List<Postage> postageList = postageMapper.listPostage(postage);
+        return PageUtil.getPage(postageList);
     }
 }

+ 81 - 24
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/postageMapper.xml

@@ -8,8 +8,8 @@
     <result column="postage_manager_status" property="postageManagerStatus" jdbcType="INTEGER" />
     <result column="postage_finance_status" property="postageFinanceStatus" jdbcType="INTEGER" />
     <result column="postage_order_source" property="postageOrderSource" jdbcType="INTEGER" />
-    <result column="postage_treatment method" property="postageTreatmentMethod" jdbcType="INTEGER" />
-    <result column="sales_orderId" property="salesOrderid" jdbcType="VARCHAR" />
+    <result column="postage_treatment_method" property="postageTreatmentMethod" jdbcType="INTEGER" />
+    <result column="sales_orderId" property="salesOrderId" jdbcType="VARCHAR" />
     <result column="postage_client_name" property="postageClientName" jdbcType="VARCHAR" />
     <result column="postage_client_tel" property="postageClientTel" jdbcType="VARCHAR" />
     <result column="postage_logistics_company" property="postageLogisticsCompany" jdbcType="VARCHAR" />
@@ -22,32 +22,80 @@
   </resultMap>
 
   <sql id="Base_Column_List" >
-    postage_id, admin_id, postage_customer_status, postage_manager_status, postage_finance_status,
-    postage_order_source, "postage_treatment method", sales_orderId, postage_client_name,
-    postage_client_tel, postage_logistics_company, postage_logistics_no, postage_amount,
-    postage_alipay, postage_alipay_name, postage_create_time, postage_update_time
+    p.postage_id, p.admin_id, p.postage_customer_status, p.postage_manager_status, p.postage_finance_status,
+    p.postage_order_source, p.postage_treatment_method, p.sales_orderId, p.postage_client_name,
+    p.postage_client_tel,p.postage_client_address, p.postage_logistics_company, p.postage_logistics_no, p.postage_amount,
+    p.postage_alipay, p.postage_alipay_name, p.postage_create_time, p.postage_update_time
   </sql>
 
-  <select id="listPostage" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="listPostage" resultMap="BaseResultMap" parameterType="Postage" >
     select
-    <include refid="Base_Column_List" />
-    from tb_rst_postage
-    where postage_id = #{postageId,jdbcType=INTEGER}
+    <include refid="Base_Column_List" />,
+    sa.admin_name AS adminName,
+    si.store_name AS storeName
+    from tb_rst_postage p
+    LEFT JOIN tb_rst_sys_admin sa ON p.admin_id = sa.admin_id
+    LEFT JOIN tb_rst_store_info si ON p.postage_order_source = si.store_id
+    <where>
+      <if test="adminId != null and adminId != ''">
+        p.admin_id = #{adminId}
+      </if>
+      <if test="postageId != null and postageId != ''">
+        AND p.postage_id = #{postageId}
+      </if>
+      <if test="postageCustomerStatus != null and postageCustomerStatus != ''">
+        AND p.postage_customer_status = #{postageCustomerStatus}
+      </if>
+      <if test="postageManagerStatus != null and postageManagerStatus != ''">
+        AND p.postage_manager_status = #{postageManagerStatus}
+      </if>
+      <if test="postageFinanceStatus != null and postageFinanceStatus != ''">
+        AND p.postage_finance_status = #{postageFinanceStatus}
+      </if>
+      <if test="postageOrderSource != null and postageOrderSource != ''">
+        AND p.postage_order_source = #{postageOrderSource}
+      </if>
+      <if test="postageTreatmentMethod != null and postageTreatmentMethod != ''">
+        AND p.postage_treatment method = #{postageTreatmentMethod}
+      </if>
+      <if test="salesOrderId != null and salesOrderId != ''">
+        AND p.sales_orderId = #{salesOrderId}
+      </if>
+      <if test="postageClientName != null and postageClientName != ''">
+        AND p.postage_client_name = #{postageClientName}
+      </if>
+      <if test="postageClientTel != null and postageClientTel != ''">
+        AND p.postage_client_tel = #{postageClientTel}
+      </if>
+      <if test="postageLogisticsCompany != null and postageLogisticsCompany != ''">
+        AND p.postage_logistics_company = #{postageLogisticsCompany}
+      </if>
+      <if test="postageLogisticsNo != null and postageLogisticsNo != ''">
+        AND p.postage_logistics_no = #{postageLogisticsNo}
+      </if>
+      <if test="postageAlipay != null and postageAlipay != ''">
+        AND p.postage_alipay = #{postageAlipay}
+      </if>
+      <if test="postageAlipayName != null and postageAlipayName != ''">
+        AND p.postage_alipay_name = #{postageAlipayName}
+      </if>
+    </where>
   </select>
 
-  <insert id="savePostage" parameterType="Postage" >
-    insert into tb_rst_postage (
-      postage_id, admin_id, postage_customer_status,
-      postage_manager_status, postage_finance_status,
-      postage_order_source, postage_treatment_method,
-      sales_orderId, postage_client_name, postage_client_tel,
-      postage_logistics_company, postage_logistics_no,
-      postage_amount, postage_alipay, postage_alipay_name
+    <insert id="savePostage" parameterType="Postage" >
+    insert into tb_rst_postage (postage_id, admin_id, postage_customer_status,
+    postage_manager_status, postage_finance_status,
+    postage_order_source, postage_treatment_method,
+    sales_orderId, postage_client_name, postage_client_tel,
+    postage_client_address,
+    postage_logistics_company, postage_logistics_no,
+    postage_amount, postage_alipay, postage_alipay_name
     )
     values (#{postageId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{postageCustomerStatus,jdbcType=INTEGER},
     #{postageManagerStatus,jdbcType=INTEGER}, #{postageFinanceStatus,jdbcType=INTEGER},
     #{postageOrderSource,jdbcType=INTEGER}, #{postageTreatmentMethod,jdbcType=INTEGER},
     #{salesOrderId,jdbcType=VARCHAR}, #{postageClientName,jdbcType=VARCHAR}, #{postageClientTel,jdbcType=VARCHAR},
+    #{postageClientAddress,jdbcType=VARCHAR},
     #{postageLogisticsCompany,jdbcType=VARCHAR}, #{postageLogisticsNo,jdbcType=VARCHAR},
     #{postageAmount,jdbcType=INTEGER}, #{postageAlipay,jdbcType=VARCHAR}, #{postageAlipayName,jdbcType=VARCHAR}
     )
@@ -72,10 +120,10 @@
         postage_order_source = #{postageOrderSource,jdbcType=INTEGER},
       </if>
       <if test="postageTreatmentMethod != null" >
-        "postage_treatment method" = #{postageTreatmentMethod,jdbcType=INTEGER},
+        postage_treatment_method = #{postageTreatmentMethod,jdbcType=INTEGER},
       </if>
-      <if test="salesOrderid != null" >
-        sales_orderId = #{salesOrderid,jdbcType=VARCHAR},
+      <if test="salesOrderId != null" >
+        sales_orderId = #{salesOrderId,jdbcType=VARCHAR},
       </if>
       <if test="postageClientName != null" >
         postage_client_name = #{postageClientName,jdbcType=VARCHAR},
@@ -95,9 +143,18 @@
       <if test="postageAlipay != null" >
         postage_alipay = #{postageAlipay,jdbcType=VARCHAR},
       </if>
-      <if test="postageAlipayName != null" >
-        postage_alipay_name = #{postageAlipayName,jdbcType=VARCHAR}
-      </if>
+        <if test="postageAlipayName != null" >
+            postage_alipay_name = #{postageAlipayName,jdbcType=VARCHAR},
+        </if>
+        <if test="postageCreateTime != null" >
+            postage_create_time = #{postageCreateTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="postageUpdateTime != null" >
+            postage_update_time = #{postageUpdateTime,jdbcType=TIMESTAMP},
+        </if>
+        <if test="postageClientAddress != null" >
+            postage_client_address = #{postageClientAddress,jdbcType=TIMESTAMP}
+        </if>
     </set>
     where postage_id = #{postageId,jdbcType=INTEGER}
   </update>

+ 64 - 14
watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminPostageController.java

@@ -1,10 +1,16 @@
 package com.iamberry.rst.controllers.cm;
 
+import com.iamberry.rst.core.cm.ComplaintTypeInfo;
 import com.iamberry.rst.core.cm.CustomerInfo;
 import com.iamberry.rst.core.cm.Postage;
 import com.iamberry.rst.core.cm.QuestionDescribe;
+import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.faces.cm.PostageService;
+import com.iamberry.rst.faces.sys.SysService;
+import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -17,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * Created by wxm
@@ -29,6 +36,8 @@ public class AdminPostageController {
 
     @Autowired
     private PostageService postageService;
+    @Autowired
+    private SysService sysService;
 
     /**
      * 获取客诉列表
@@ -43,11 +52,32 @@ public class AdminPostageController {
                                     @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                     @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ModelAndView mv = new ModelAndView("cm/postage/postage_list");
-//        PagedResult<Postage> pagedResult = postageService.listPostage(pageNO, pageSize, postage, totalNum == 0);
-//        if (totalNum != 0) {
-//            pagedResult.setTotal(totalNum);
-//        }
-//       StitchAttrUtil.setModelAndView(customer, mv, "/admin/bom/_bom_list", pagedResult);
+
+        PagedResult<Postage> pagedResult = postageService.listPostage(pageNO, pageSize, postage, totalNum == 0);
+        if (totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+        }
+        //查询跟进客服集合
+        Admin admin = new Admin();
+        admin.setAdminStatus(1);
+        List<Admin> adminList = sysService.listSelectAdmin(admin);
+        //获取登录人id
+        Admin loginAdmin = AdminUtils.getLoginAdmin();
+        //判断当前登录人权限
+        int operationPermissions = 0;//0=无任何权限 1=客服  2=客服经理 3=财务经理 4=超级管理员
+        if(loginAdmin.getAdminDept() == 3){
+            operationPermissions = 1;
+            if(loginAdmin.getAdminManager() == 2){
+                operationPermissions = 2;
+            }
+        }else if(loginAdmin.getAdminDept() == 4 && loginAdmin.getAdminManager() == 2){
+            operationPermissions = 3;
+        }else if(loginAdmin.getAdminDept() == 1 && loginAdmin.getAdminManager() == 2){
+            operationPermissions = 4;
+        }
+        mv.addObject("operationPermissions", operationPermissions);
+        mv.addObject("adminList", adminList);
+        StitchAttrUtil.setModelAndView(postage, mv, "/admin/postage/postage_list", pagedResult);
         return mv;
     }
 
@@ -57,18 +87,38 @@ public class AdminPostageController {
      * @return
      */
     @ResponseBody
-    @RequiresPermissions("postage:update:customer")
-    @RequestMapping(value = "/update_customer")
-    public ResponseJson selectQuestionDescribe(HttpServletRequest request, Integer postageId) throws Exception {
+    @RequiresPermissions("postage:update:postage")
+    @RequestMapping(value = "/update_postage_status")
+    public ResponseJson updatePostageStatus(HttpServletRequest request, Integer postageId,Integer status,Integer type) throws Exception {
         if(postageId == null || postageId == 0){
-            return new ResponseJson(500, "未获取到问题描述", 500);
+            return new ResponseJson(500, "未获取到记录id", 500);
+        }
+        if(type == null || type == 0){
+            return new ResponseJson(500, "修改失败。请刷新重试", 500);
+        }
+        if(status == null || status == 0){
+            return new ResponseJson(500, "修改失败。请刷新重试", 500);
         }
         Postage postage = new Postage();
-        postage.setPostageCustomerStatus(2);
-        postageService.updatePostage(postage);
-
-        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
-        return rj;
+        postage.setPostageId(postageId);
+        //判断修改类型 1=客服修改申请状态 2=客服经理修改审核状态 3=财务经理修改转账状态
+        switch (type){
+            case 1:
+                postage.setPostageCustomerStatus(status);
+             break;
+            case 2:
+                postage.setPostageManagerStatus(status);
+                break;
+            case 3:
+                postage.setPostageFinanceStatus(status);
+                break;
+        }
+        Integer num = postageService.updatePostage(postage);
+        if(num > 0){
+            return new ResponseJson(200, "修改成功", 200);
+        }else{
+            return new ResponseJson(500, "修改失败", 500);
+        }
     }
 
 

+ 6 - 6
watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -6,15 +6,15 @@ jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=rst_test
+jdbc.password=RST_test
 
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
-jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=root
-jdbc.password=root
+#jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=root
+#jdbc.password=root
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD end ######
 
 #pool settings

+ 90 - 396
watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -31,75 +31,15 @@
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 客诉列表
+    <span class="c-gray en">&gt;</span> 邮费转账列表
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
     <div class="text-c">
-        <form action="${path}/admin/customer/select_customer_list" method="post">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
-            <input type="text" style="width:90px;height:36px;margin-right: 0px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
-            <input type="text" style="width:90px;height:36px;margin-right: 0px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>
-
-            <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
-            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
-                <option value="">处理结果</option>
-                <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>
-            </select>
-
-            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
-                <option value="">来源</option>
-                <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 1 >selected="selected"</#if></#if>>400电话</option>
-                <option value="2" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 2 >selected="selected"</#if></#if>>微信公众号</option>
-                <option value="3" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 3 >selected="selected"</#if></#if>>其他</option>
-            </select>
-            <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 120px;margin: 0px;">
-                <option value ="">客诉产品</option>
-                <#if typeList?? &&  (typeList?size > 0) >
-                    <#list typeList as type>
-                        <option value ="${type.typeId!}" <#if customerInfo.typeId??><#if customerInfo.typeId ==type.typeId >selected="selected"</#if></#if>>${type.typeName!}</option>
-                    </#list>
-                </#if>
-            </select>
-           <#-- <select class="my-select" name="complaintId" style="height: 36px;width: 120px;margin: 0px;">
-                <option value ="">客诉类型</option>
-                <#if complaintTypeList?? &&  (complaintTypeList?size > 0) >
-                    <#list complaintTypeList as complaint>
-                        <option value ="${complaint.complaintId!}" <#if customerInfo.complaintId??><#if customerInfo.complaintId ==complaint.complaintId >selected="selected"</#if></#if>>${complaint.complaintClassName!}</option>
-                    </#list>
-                </#if>
-            </select>-->
-            <select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;>
-                <option value ="">是否需要回访</option>
-                <option value="">是否回访</option>
-                <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
-                <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>
-                <#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>
-                    </#list>
-                </#if>
-            </select>
-            <select class="my-select" name="visitDesignatedAdminId" style="height: 36px;width: 120px;margin: 0px;">
-                <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>
-                    </#list>
-                </#if>
-            </select>
+        <form action="${path}/admin/postage/postage_list" method="post">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.salesOrderId!}" placeholder="efast订单号" id="salesOrderId" name="salesOrderId">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.postageClientName!}" placeholder="请输入姓名" id="postageClientName" name="postageClientName">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${postage.postageClientTel!}" placeholder="请输入电话号码" id="postageClientTel" name="postageClientTel">
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px; id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>
@@ -109,246 +49,107 @@
         <table class="table table-border table-bg table-bordered">
         <thead>
         <tr class="text-c">
-            <th width="50">客诉编号</th>
-            <th width="50">跟进客服</th>
-            <th width="60">姓名</th>
-            <th width="70">电话</th>
-            <th width="80">来源入口</th>
-            <th width="80">客诉产品</th>
-            <#--<th width="80">客诉类型</th>-->
-            <th width="80">问题类型</th>
-            <th width="100">问题简述</th>
-            <th width="60">销售</th>
-            <th width="80">购买日期</th>
-            <th width="60">区域</th>
-            <th width="60">TDS</th>
-            <th width="80">物流单号</th>
-            <th width="80">处理结果</th>
-            <th width="80">需要回访</th>
-            <th width="80">客诉时间</th>
+            <th width="50">客服人员</th>
+            <th width="50">申请状态</th>
+            <th width="50">客服审核状态</th>
+            <th width="50">财务审核状态</th>
+            <th width="60">订单来源</th>
+            <th width="70">售后处理方式</th>
+            <th width="80">订单号</th>
+            <th width="80">客户姓名</th>
+            <th width="80">联系电话</th>
+            <th width="100">详细地址</th>
+            <th width="60">退回快递名称</th>
+            <th width="80">快递单号</th>
+            <th width="60">退款金额</th>
+            <th width="60">支付宝账户</th>
+            <th width="80">支付宝姓名</th>
             <th width="100">操作</th>
         </tr>
         </thead>
         <tbody>
             <#if page.dataList?? &&  (page.dataList?size > 0) >
-                    <#list page.dataList as customer>
+                    <#list page.dataList as postage>
                         <tr class="text-c">
-                            <td>${customer.customerId!''}</td>
-                            <td>${customer.adminName!''}</td>
-                            <td>${customer.customerName!''}
-                                <#if customer.customerWechatName?? >
-                                    <#if customer.customerWechatName?length gt 0 >
-                                        <br>(${customer.customerWechatName})
-                                    </#if>
-                                </#if>
-                            </td>
-
-                            <#if (customer.customerTel)?? && customer.customerTel?length gt 7>
-                                <td>${customer.customerTel?substring(0,3)}***${customer.customerTel?substring(customer.customerTel?length-4,customer.customerTel?length)}</td>
-                            <#else>
-                                <td>${customer.customerTel!''}</td>
-                            </#if>
+                            <td>${postage.adminName!''}</td>
                             <td>
-                                <#if customer.customerSourceType == 1>
-                                    400电话
-                                <#elseif customer.customerSourceType == 2>
-                                    微信公众号
-                                <#elseif customer.customerSourceType == 3>
-                                    ${customer.customerSource!''}
+                                <#if postage.postageCustomerStatus == 1>
+                                    待申请
+                                <#elseif postage.postageCustomerStatus == 2>
+                                    申请中
                                 </#if>
                             </td>
-                            <td>${customer.typeName!''}</td>
-                            <#--<td>${customer.complaintClassName!''}</td>-->
-                            <td>${customer.smallClassName!''}</td>
                             <td>
-                                <span class="label txt2" title="${customer.describeTitle!}" >${customer.describeTitle!'暂无'}</span><br/>
-                                    <#if customer.describeTitle??>
-                                        <a style="text-decoration:none;" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
-                                            <font color=#06c>查看详情</font>
-                                        </a>&nbsp;
-                                    </#if>
-                            </td>
-                            <td>${customer.companyName!''}<br/>${customer.storeName!''}</td>
-                            <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
-                            <td>${customer.customerArea!''}</td>
-                            <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
-                            <td>
-                                <#if (customer.sendLogisticsNo??) || (customer.backLogisticsNo??)>
-
-                                        <#if (customer.backLogisticsNo??)>
-                                            寄回:
-                                            <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??>
-                                            寄出:
-                                            <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${customer.sendLogisticsNo!''}&billName=${customer.sendLogisticsCompany!''}',500,400);">${customer.sendLogisticsNo!''}</a><br>
-                                        </#if>
-                                <#else>
-                                    无
-                                </#if>
-                            </td>
-                            <td id="txt_customerIsSolve">
-                                <#if customer.customerIsSolve == 1>
-                                    已解决
-                                <#elseif customer.customerIsSolve == 2>
-                                    未解决
-                                <#elseif customer.customerIsSolve == 3>
-                                    换新(
-                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRenewed(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
-                                        <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
-                                            <#list customer.complaintDetectList as complaintDetect>
-                                                <#if (complaintDetect_index = 0)>
-                                                    <#if complaintDetect.detectState == 1>
-                                                        待仓库转入
-                                                    <#elseif complaintDetect.detectState == 2>
-                                                        正在检查
-                                                    <#elseif complaintDetect.detectState == 3>
-                                                        检查通过
-                                                    <#elseif complaintDetect.detectState == 4>
-                                                        检查未通过
-                                                    </#if>
-                                                </#if>
-                                            </#list>
-                                        </#if>-->
-                                        </font>
-                                    </a>
-                                    )
-                                <#elseif customer.customerIsSolve == 4>
-                                    维修(
-                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRepair(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
-                                            <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
-                                                <#list customer.complaintDetectList as complaintDetect>
-                                                    <#if (complaintDetect_index = 0)>
-                                                        <#if complaintDetect.detectState == 1>
-                                                            待仓库转入
-                                                        <#elseif complaintDetect.detectState == 2>
-                                                            正在检查
-                                                        <#elseif complaintDetect.detectState == 3>
-                                                            检查通过
-                                                        <#elseif complaintDetect.detectState == 4>
-                                                            检查未通过
-                                                        </#if>
-                                                    </#if>
-                                                </#list>
-                                            </#if>--></font>
-                                    </a>
-                                    )
-                                <#elseif customer.customerIsSolve == 5>
-                                    补发(
-                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateReissue(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if></font>
-                                    </a>
-                                    )
-                                <#elseif customer.customerIsSolve == 6>
-                                    退货(
-                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateBookGoods(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
-                                    </a>
-                                    )
-                                <#elseif customer.customerIsSolve == 7>
-                                    无理由退货(
-                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateNoreasonBack(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
-                                    </a>
-                                    )
+                                <#if postage.postageManagerStatus == 1>
+                                    审核中
+                                <#elseif postage.postageManagerStatus == 2>
+                                    通过
+                                <#elseif postage.postageManagerStatus == 3>
+                                    驳回
                                 </#if>
                             </td>
                             <td>
-                                <#if customer.customerIsVisit == "1">
-                                    不需要回访
-                                <#elseif customer.customerIsVisit == "2">
-                                    <#if customer.visitStatus == 1>
-                                        待回访<br/>
-                                        <a style="text-decoration:none" href="javascript:void(0);" title="回访内容" onclick="getVisitInfo(${customer.customerId!''},1)">
-                                            <font style="color:red;">(${(customer.visitDate?string("yyyy-MM-dd"))!''}完成)</font>
-                                        </a>&nbsp;
-                                    <#elseif customer.visitStatus == 2>
-                                        已回访<br/>
-                                        <a style="text-decoration:none" href="javascript:void(0);" title="回访内容" onclick="getVisitInfo(${customer.customerId!''},2)">
-                                            <font color=#06c>回访内容</font>
-                                        </a>&nbsp;
-                                    </#if>
-                                </#if>
-                            </td>
+                                <#if postage.postageFinanceStatus == 1>
+                                    审核中
+                                <#elseif postage.postageFinanceStatus == 2>
+                                    通过(已申请待转账)
+                                <#elseif postage.postageFinanceStatus == 3>
+                                    驳回
+                                <#elseif postage.postageFinanceStatus == 4>
+                                    已转账
+                                </#if></td>
+                            <td>${postage.storeName!''}</td>
                             <td>
-                                ${(customer.customerCreateTime?string("yyyy-MM-dd"))!''}<br>
-                                ${(customer.customerCreateTime?string("HH:mm:ss"))!''}
+                                <#if postage.postageTreatmentMethod == 3>
+                                    换新
+                                <#elseif postage.postageTreatmentMethod == 4>
+                                    维修
+                                <#elseif postage.postageTreatmentMethod == 5>
+                                    补发
+                                <#elseif postage.postageTreatmentMethod == 6>
+                                    退货
+                                <#elseif postage.postageTreatmentMethod == 7>
+                                    无理由退货
+                                </#if></td>
+                            <td>${postage.salesOrderId!''}</td>
+                            <td>${postage.postageClientName!''}</td>
+                            <td><#if (postage.postageClientTel)?? && postage.postageClientTel?length gt 7>
+                                ${postage.postageClientTel?substring(0,3)}***${postage.postageClientTel?substring(postage.postageClientTel?length-4,postage.postageClientTel?length)}
+                            <#else>
+                                ${postage.postageClientTel!''}
+                            </#if>
                             </td>
+                            <td>${postage.postageClientAddress!''}</td>
                             <td>
-                                <#if customer.customerIsSolve == 2>
-                                    <a style="text-decoration:none" href="javascript:void(0);" title="已解决" onclick="updateCustomerIsSolve(${customer.customerId!''})">
-                                        <font color=#06c>已解决</font>
-                                    </a><br/>
-                                </#if>
-                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${customer.customerId!''})">
-                                    <font color=#06c>详情</font>
-                                </a><br/>
-                                <a style="text-decoration:none" href="javascript:void(0);" title="修改客诉" onclick="admin_update_customer(${customer.customerId!''})">
-                                    <font color=#06c>修改客诉</font>
-                                </a><br/>
-                                <#if customer.customerIsVisit == "2">
-                                    <#if customer.visitStatus == 1 && customer.customerIsVisit == "2">
-                                        <a style="text-decoration:none" href="javascript:void(0);" title="已完成回访" onclick="toUpdateVisit(${customer.customerId!''})">
-                                            <font color=#06c>已完成回访</font>
-                                        </a><br/>
-                                    </#if>
-                                </#if>
-                                <#if customer.customerIsVisit == "1">
-                                    <a style="text-decoration:none" href="javascript:void(0)" title="需要回访" onclick="toAddVisit(${customer.customerId!''})">
-                                        <font color=#06c>需要回访</font>
-                                    </a><br/>
-                                </#if>
+                            <#if postage.postageLogisticsCompany??>
+                                 <#if postage.postageLogisticsCompany == "sto">申通快递</#if>
+                                 <#if postage.postageLogisticsCompany == "yto">圆通快递</#if>
+                                 <#if postage.postageLogisticsCompany == "sf">顺丰快递</#if>
+                                 <#if postage.postageLogisticsCompany == "ems">邮政EMS</#if>
+                                 <#if postage.postageLogisticsCompany == "zto">中通快递</#if>
+                                 <#if postage.postageLogisticsCompany == "zjs">宅急送</#if>
+                                 <#if postage.postageLogisticsCompany == "yunda">韵达快递</#if>
+                                 <#if postage.postageLogisticsCompany == "cces">cces快递</#if>
+                                 <#if postage.postageLogisticsCompany == "pick">上门提货</#if>
+                                 <#if postage.postageLogisticsCompany == "htky">汇通快递</#if>
+                                 <#if postage.postageLogisticsCompany == "ttkdex">天天快递</#if>
+                                 <#if postage.postageLogisticsCompany == "stars">星晨急便</#if>
+                                 <#if postage.postageLogisticsCompany == "jd">京东快递</#if>
+                                 <#if postage.postageLogisticsCompany == "01">其他</#if>
+                                 <#if postage.postageLogisticsCompany == "02">上门送货</#if>
+                            <#else>
+                                未知
+                            </#if>
                             </td>
+                            <td>${postage.postageLogisticsNo!''}</td>
+                            <td>${postage.postageAmount!''}</td>
+                            <td>${postage.postageAlipay!''}</td>
+                            <td>${postage.postageAlipayName!''}</td>
+                            <td></td>
                         </tr>
                     </#list>
             <#else>
-                <tr><td colspan="17" class="td-manage text-c" >暂时没有客诉信息,请添加!</td></tr>
+                <tr><td colspan="17" class="td-manage text-c" >暂时没有邮费信息!</td></tr>
             </#if>
         </tbody>
     </table>
@@ -358,125 +159,22 @@
 <#include "/base/page_util.ftl">
 </tfoot>
 <script type="text/javascript">
-    /**
-     * 跳转到添加customer页面
-     */
-    function toAddCustomer(){
-        window.location.href= "${path}/admin/customer/to_add_customer";
-    }
-
-    /**
-     *跳转到编辑页面
-     * @param employee
-     */
-    function admin_update_customer(customerId) {
-        window.location.href= "${path}/admin/customer/to_update_customer?customerId="+customerId;
-    }
 
-    /**
-     *跳转到详情页面
-     * @param employee
-     */
-    function admin_details_customer(customerId) {
-        window.location.href= "${path}/admin/customer/_customer_info?customerId="+customerId;
-    }
 
     /**
-     *修改客诉
-     * @param employee
+     * 修改申请状态
      */
-    function admin_update_customer(customerId) {
-        window.location.href= "${path}/admin/customer/to_update_customer?customerId="+customerId;
-    }
-
-    function hide_this(val) {
-        $(val).parent().parent().hide();
-    }
-
-
-    /**
-     * 进入添加回访页面
-     */
-    function toAddVisit(customerId) {
-        layer_show("客诉回访","${path}/admin/customer/_add_visit?customerId="+customerId,"780","500");
-    }
-
-    /**
-     * 进入回访完成页面
-     */
-    function toUpdateVisit(customerId) {
-        layer_show("已完成回访","${path}/admin/customer/_update_visit_info?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入查询回访信息页面
-     */
-    function getVisitInfo(customerId,num) {
-        layer_show("回访内容","${path}/admin/customer/_visit_info?customerId="+customerId+"&num="+num,"800","500");
-    }
-
-    /**
-     * 进入查询问题描述信息页面
-     */
-    function getDescribeInfo(customerId) {
-        layer_show("问题描述","${path}/admin/customer/_question_describe?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入修改换新页面
-     */
-    function toUpdateRenewed(customerId) {
-        layer_show("换新处理","${path}/admin/customer/_update_renewed?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入修改维修页面
-     */
-    function toUpdateRepair(customerId) {
-        layer_show("维修处理","${path}/admin/customer/_to_update_repair?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入修改退货页面
-     */
-    function toUpdateBookGoods(customerId) {
-        layer_show("退货处理","${path}/admin/customer/_to_update_book_goods?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入修改无理由退货页面
-     */
-    function toUpdateNoreasonBack(customerId) {
-        layer_show("无理由退货处理","${path}/admin/customer/_update_noreason_back?customerId="+customerId,"800","500");
-    }
-
-    /**
-     * 进入修改售后补发页面
-     */
-    function toUpdateReissue(customerId) {
-        layer_show("补发处理","${path}/admin/customer/_to_update_reissue?customerId="+customerId,"800","500");
-    }
-
-    /*子页面添加完信息后回显添加结果是否成功*/
-    function custome_result(str,num) {
-        layer.msg(str,{icon:num,time:1000});
-    }
-
-    /**
-     * 将未解决状态修改为已解决
-     */
-    function updateCustomerIsSolve(customerId) {
+    function updateCustomerStatus(postageId,status,type) {
         layer.confirm('确认要修改吗?',function(index){
             $.ajax({
                 cache: true,
                 type: "POST",
-                data: {"customerId":customerId},
-                url: "${path}/admin/customer/update_customerIsSolve",
+                data: {"postageId":postageId,"status" : status,"type" : type},
+                url: "${path}/admin/postage/update_postage_status",
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {
                         layer.msg(data.resultMsg,{icon: 1,time:1000});
-                       // $('#txt_customerIsSolve').html('已解决');
                     } else {
                         layer.msg(data.resultMsg,{icon: 5,time:1000});
                     }
@@ -489,10 +187,6 @@
 
         });
     }
-    /*查看物流*/
-    function openLogistics(title, url, w, h) {
-        layer_show(title,url,w,h);
-    }
 </script>
 </body>
 </html>