增加售后规则查看功能

watero-rst-core/src/main/java/com.iamberry.rst.core/order/AfterrulesInfo.java

@@ -0,0 +1,192 @@
+package com.iamberry.rst.core.order;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by Administrator on 2019/2/28.
+ */
+public class AfterrulesInfo implements Serializable{
+    private static final long serialVersionUID = 2162990744480531865L;
+    private Integer afterrulesId;
+    private String storeId;//店铺id
+    private String returnReason;//无理由退货
+    private String qualityPeriod;//质量问题退货期
+    private String warrantyProblem;//质量问题包换期
+    private String governancePeriod;//质量问题-免费维修期
+    private String payRepair;//付费维修
+    private String returnReasonInfo;//无理由退货展示信息
+    private String qualityPeriodInfo;//质量问题退货期展示信息
+    private String warrantyProblemInfo;//质量问题包换期展示信息
+    private String governancePeriodInfo;//质量问题-免费维修期展示信息
+    private String payRepairInfo;//付费维修展示信息
+    private Integer afterrulesStatus;//启用状态1.正在使用，2停止使用
+    private Integer afterrulesType;//规则类型1.正常规则 2.特殊规则
+    private Date afterrulesCreateTime;
+
+    private Integer isReturnReason;//是否符合无理由退货 1是 2否
+    private Integer isQualityPeriod;//是否符合质量问题退货期1是 2否
+    private Integer isWarrantyProblem;//是否符合质量问题包换期1是 2否
+    private Integer isGovernancePeriod;//是否符合质量问题-免费维修期1是 2否
+    private Integer isPayRepair;//是否符合付费维修1是 2否
+
+    public Integer getAfterrulesId() {
+        return afterrulesId;
+    }
+
+    public void setAfterrulesId(Integer afterrulesId) {
+        this.afterrulesId = afterrulesId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getReturnReason() {
+        return returnReason;
+    }
+
+    public void setReturnReason(String returnReason) {
+        this.returnReason = returnReason;
+    }
+
+    public String getQualityPeriod() {
+        return qualityPeriod;
+    }
+
+    public void setQualityPeriod(String qualityPeriod) {
+        this.qualityPeriod = qualityPeriod;
+    }
+
+    public String getWarrantyProblem() {
+        return warrantyProblem;
+    }
+
+    public void setWarrantyProblem(String warrantyProblem) {
+        this.warrantyProblem = warrantyProblem;
+    }
+
+    public String getGovernancePeriod() {
+        return governancePeriod;
+    }
+
+    public void setGovernancePeriod(String governancePeriod) {
+        this.governancePeriod = governancePeriod;
+    }
+
+    public String getPayRepair() {
+        return payRepair;
+    }
+
+    public void setPayRepair(String payRepair) {
+        this.payRepair = payRepair;
+    }
+
+    public String getReturnReasonInfo() {
+        return returnReasonInfo;
+    }
+
+    public void setReturnReasonInfo(String returnReasonInfo) {
+        this.returnReasonInfo = returnReasonInfo;
+    }
+
+    public String getQualityPeriodInfo() {
+        return qualityPeriodInfo;
+    }
+
+    public void setQualityPeriodInfo(String qualityPeriodInfo) {
+        this.qualityPeriodInfo = qualityPeriodInfo;
+    }
+
+    public String getWarrantyProblemInfo() {
+        return warrantyProblemInfo;
+    }
+
+    public void setWarrantyProblemInfo(String warrantyProblemInfo) {
+        this.warrantyProblemInfo = warrantyProblemInfo;
+    }
+
+    public String getGovernancePeriodInfo() {
+        return governancePeriodInfo;
+    }
+
+    public void setGovernancePeriodInfo(String governancePeriodInfo) {
+        this.governancePeriodInfo = governancePeriodInfo;
+    }
+
+    public String getPayRepairInfo() {
+        return payRepairInfo;
+    }
+
+    public void setPayRepairInfo(String payRepairInfo) {
+        this.payRepairInfo = payRepairInfo;
+    }
+
+    public Integer getAfterrulesStatus() {
+        return afterrulesStatus;
+    }
+
+    public void setAfterrulesStatus(Integer afterrulesStatus) {
+        this.afterrulesStatus = afterrulesStatus;
+    }
+
+    public Integer getAfterrulesType() {
+        return afterrulesType;
+    }
+
+    public void setAfterrulesType(Integer afterrulesType) {
+        this.afterrulesType = afterrulesType;
+    }
+
+    public Date getAfterrulesCreateTime() {
+        return afterrulesCreateTime;
+    }
+
+    public void setAfterrulesCreateTime(Date afterrulesCreateTime) {
+        this.afterrulesCreateTime = afterrulesCreateTime;
+    }
+
+    public Integer getIsReturnReason() {
+        return isReturnReason;
+    }
+
+    public void setIsReturnReason(Integer isReturnReason) {
+        this.isReturnReason = isReturnReason;
+    }
+
+    public Integer getIsQualityPeriod() {
+        return isQualityPeriod;
+    }
+
+    public void setIsQualityPeriod(Integer isQualityPeriod) {
+        this.isQualityPeriod = isQualityPeriod;
+    }
+
+    public Integer getIsWarrantyProblem() {
+        return isWarrantyProblem;
+    }
+
+    public void setIsWarrantyProblem(Integer isWarrantyProblem) {
+        this.isWarrantyProblem = isWarrantyProblem;
+    }
+
+    public Integer getIsGovernancePeriod() {
+        return isGovernancePeriod;
+    }
+
+    public void setIsGovernancePeriod(Integer isGovernancePeriod) {
+        this.isGovernancePeriod = isGovernancePeriod;
+    }
+
+    public Integer getIsPayRepair() {
+        return isPayRepair;
+    }
+
+    public void setIsPayRepair(Integer isPayRepair) {
+        this.isPayRepair = isPayRepair;
+    }
+}

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

@@ -425,4 +425,9 @@ public interface SalesOrderService {
      * @return
      */
     Integer splitOrder(String mainOrderId, List<SalesOrder> salesOrderList);
+
+    /**
+     * 根据店铺id获取售后规则
+     */
+    AfterrulesInfo getAfterrulesInfo(Integer storeId);
 }

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

@@ -1179,6 +1179,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return flag;
     }
 
-
-
+    @Override
+    public AfterrulesInfo getAfterrulesInfo(Integer storeId) {
+        return salesOrderMapper.getAfterrulesInfo(storeId);
+    }
 }

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

@@ -350,4 +350,9 @@ public interface SalesOrderMapper {
      * @return
      */
     List<SalesOrder> salesOrderAndItemStat(SalesOrder salesOrder);
+
+    /**
+     * 根据店铺id获取售后规则
+     */
+    AfterrulesInfo getAfterrulesInfo(Integer storeId);
 }

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

@@ -749,9 +749,9 @@ ELSE
 	'未知'
 END) AS customerSecondaryCustomer,
 sa.admin_name AS adminName,
-cr.relation_back_logistics_company AS relationBackLogisticsCompany,
-cr.relation_back_logistics_no AS relationBackLogisticsNo,
-cr.relation_back_receipt_date AS relationBackReceiptDate,
+csi.sendback_logistics_company AS relationBackLogisticsCompany,
+csi.sendback_logistics_no AS relationBackLogisticsNo,
+csi.sendback_sign_time AS relationBackReceiptDate,
 cr.relation_send_status AS relationBackStatus,
 cr.relation_send_logistics_company AS relationSendLogisticsCompany,
 cr.relation_send_logistics_no AS relationSendLogisticsNo,
@@ -771,8 +771,7 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
 LEFT JOIN tb_rst_cm_relation cr ON cr.customer_id = c.customer_id
 LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id
 LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
-/*where cr.relation_id in (select relation_id from tb_rst_postage_info where postage_status = 1 and postage_create_time > '2019-02-12 00:00:00')
-and cr.relation_is_transfer = 10*/
+LEFT JOIN tb_rst_cm_sendback_info csi ON csi.relation_id = cr.relation_id
 </select>
   <!-- 退换货统计sql start -->
   <!-- 总销量 -->

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

@@ -68,7 +68,8 @@
             trsi.store_name  storeName,
             pt.proc_type_name procTypeName,
             od.batch_create_time  batchCreateTime,
-            ao.admin_name  salesAdminName
+            ao.admin_name  salesAdminName,
+            pt.proc_type_id procTypeId
         FROM
         (
             SELECT
@@ -1675,4 +1676,8 @@
         ORDER BY soi.sales_create_time DESC
     </select>
 
+    <select id="getAfterrulesInfo" parameterType="Integer" resultType="AfterrulesInfo">
+        select * from tb_rst_afterrules_info
+        WHERE store_id = #{storeId}
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -24,15 +24,14 @@ import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.MessageService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
-import com.iamberry.rst.utils.AdminUtils;
-import com.iamberry.rst.utils.ExcelUtil;
-import com.iamberry.rst.utils.GenerateKeyUtil;
-import com.iamberry.rst.utils.OrderNoUtil;
+import com.iamberry.rst.utils.*;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ObjectExcelView;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
 import com.iamberry.wechat.tools.payUtil.StringUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.Logical;
@@ -95,7 +94,7 @@ public class AdminOrderController {
     @Autowired
     private ExcelUtil excelUtil;
     @Autowired
-    private GenerateKeyUtil generateKeyUtil ;
+    private GenerateKeyUtil generateKeyUtil;
 
     /**
      * 进入更换滤芯页面

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
+import com.iamberry.rst.core.order.AfterrulesInfo;
 import com.iamberry.rst.core.order.OrderBatch;
 import com.iamberry.rst.core.order.OrderCorrectInfo;
 import com.iamberry.rst.core.order.ProductColor;
@@ -17,12 +18,10 @@ import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.order.OrderBatchService;
 import com.iamberry.rst.faces.product.ProductService;
-import com.iamberry.rst.utils.AdminUtils;
-import com.iamberry.rst.utils.ExcelUtil;
-import com.iamberry.rst.utils.GenerateKeyUtil;
-import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.rst.utils.*;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -70,7 +69,8 @@ public class AdminSalesOrderController {
     private GenerateKeyUtil generateKeyUtil ;
     @Autowired
     private LogisticsInfoService logisticsInfoService;
-
+    @Autowired
+    private KuaiDi100 kuaidi100;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -1382,5 +1382,133 @@ public class AdminSalesOrderController {
         }
         return ResponseJson.getSUCCESS();
     }
+    /**
+     * 根据店铺id查询售后规则
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("salesOrder:select:salesOrder")
+    @ResponseBody
+    @RequestMapping("/getAfterrulesInfo")
+    public ModelAndView getAfterrulesInfo(HttpServletRequest request, Integer salesId) {
+        ModelAndView mv = new ModelAndView("order/afterrules_info");
+        if(salesId == null){
+            return mv;
+        }
+        //查询订单信息
+        SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
+        if(salesOrder == null){
+            return mv;
+        }
+        if(salesOrder.getSalesStoreId() == null){
+            return mv;
+        }
+        //查询售后规则
+        AfterrulesInfo afterrulesInfo = salesOrderService.getAfterrulesInfo(salesOrder.getSalesStoreId());
+        if(afterrulesInfo == null){//等于空则查询通用售后规则
+            afterrulesInfo = salesOrderService.getAfterrulesInfo(0);
+        }
+        //获取签收时间（如果当前日期距离下单日期 未超过7天，则将下单日期当做签收日期；如果当前日期距离下单日期 超过7天，将通过快递100拉取物流单号的签收日期，如果获取到了，就按照快递100的签收日期计算；若未获取到签收日期，则通过：出库日期（若出库日期为空，则取下单日期）+3天当做签收日期。）
+        //当前时间减订购时间
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date dateReceipt = new Date();
+        long diff = new Date().getTime() - salesOrder.getSalesSalesTime().getTime();
+        long diffDays = diff / (24 * 60 * 60 * 1000);
+        if(diffDays < 7){
+            dateReceipt = salesOrder.getSalesSalesTime();
+        }else{
+            //通过快递100获取签收时间
+            if(!StringUtils.isEmpty(salesOrder.getSalesPostFirm()) && !StringUtils.isEmpty(salesOrder.getSalesPostNum())) {
+                JSONObject rst = kuaidi100.getExpressInfo(salesOrder.getSalesPostFirm(), salesOrder.getSalesPostNum());
+                if (rst.has("state") && rst.getInt("state") == 3) {    //当快递状态为已签收的时候
+                    JSONArray JSONArray = rst.getJSONArray("data");
+                    JSONObject JSONObjects = JSONArray.getJSONObject(0);
+                    try {
+                        dateReceipt = format.parse(JSONObjects.getString("time"));
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }else{//若未获取到签收日期，则通过出库日期（若出库日期为空，则取下单日期）+3天当做签收日期
+                    Calendar rightNow = Calendar.getInstance();
+                    if(salesOrder.getSalesDeliverTime() == null){
+                        rightNow.setTime(salesOrder.getSalesSalesTime());
+                    }else{
+                        rightNow.setTime(salesOrder.getSalesDeliverTime());
+                    }
+                    rightNow.add(Calendar.DAY_OF_YEAR,3);
+                    dateReceipt = rightNow.getTime();
+                }
+            }
+        }
+        //判断是否符合售后条件
+        //当前时间减去签收时间获取使用天数
+        long signTime = new Date().getTime() - dateReceipt.getTime();
+        long useTime = diff / (24 * 60 * 60 * 1000);
+        Integer state;
+        Integer end;
+        //是否符合无理由退货
+        JSONObject returnReason = JSONObject.fromObject(afterrulesInfo.getReturnReason());
+        state = returnReason.getInt("state");
+        end = returnReason.getInt("end");
+        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+            end = (int)useTime+1;
+        }
+        if(useTime > state && useTime < end){
+            afterrulesInfo.setIsReturnReason(1);
+        }else{
+            afterrulesInfo.setIsReturnReason(2);
+        }
+        //是否符合质量问题退货期
+        JSONObject qualityPeriod = JSONObject.fromObject(afterrulesInfo.getQualityPeriod());
+        state = qualityPeriod.getInt("state");
+        end = qualityPeriod.getInt("end");
+        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+            end = (int)useTime+1;
+        }
+        if(useTime > state && useTime < end){
+            afterrulesInfo.setIsQualityPeriod(1);
+        }else{
+            afterrulesInfo.setIsQualityPeriod(2);
+        }
+        //是否符合质量问题退货期
+        JSONObject warrantyProblem = JSONObject.fromObject(afterrulesInfo.getWarrantyProblem());
+        state = warrantyProblem.getInt("state");
+        end = warrantyProblem.getInt("end");
+        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+            end = (int)useTime+1;
+        }
+        if(useTime > state && useTime < end){
+            afterrulesInfo.setIsWarrantyProblem(1);
+        }else{
+            afterrulesInfo.setIsWarrantyProblem(2);
+        }
+        //是否符合质量问题-免费维修期
+        JSONObject governancePeriod = JSONObject.fromObject(afterrulesInfo.getGovernancePeriod());
+        state = governancePeriod.getInt("state");
+        end = governancePeriod.getInt("end");
+        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+            end = (int)useTime+1;
+        }
+        if(useTime > state && useTime < end){
+            afterrulesInfo.setIsGovernancePeriod(1);
+        }else{
+            afterrulesInfo.setIsGovernancePeriod(2);
+        }
+        //是否符合付费维修
+        JSONObject payRepair = JSONObject.fromObject(afterrulesInfo.getPayRepair());
+        state = payRepair.getInt("state");
+        end = payRepair.getInt("end");
+        if(end == 0){//如果结束时间等于0，表示没有结束时间，默认为大于使用时间；
+            end = (int)useTime+1;
+        }
+        if(useTime > state && useTime < end){
+            afterrulesInfo.setIsPayRepair(1);
+        }else{
+            afterrulesInfo.setIsPayRepair(2);
+        }
 
+        mv.addObject("afterrulesInfo", afterrulesInfo);
+        return mv;
+    }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -972,7 +972,7 @@ public class AwaitSendController {
                     }
                 }
                 row.add(salesShoppingStatus);
-                row.add(salesOrder.getSalesDistributionTime() == null ? null:formatter.format(salesOrder.getSalesDistributionTime()));  //salesDistributionTime
+                row.add(salesOrder.getSalesDistributionTime() == null ? formatter.format(salesOrder.getSalesSendTime()):formatter.format(salesOrder.getSalesDistributionTime()));  //salesDistributionTime
                 row.add(salesOrder.getSalesSendTime() == null ? null:formatter.format(salesOrder.getSalesSendTime()));
 
                 String salesDeliver = "";

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -191,6 +191,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.PostageInfo" alias="PostageInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackInfo" alias="SendbackInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.SendbackItem" alias="SendbackItem"/>
+		<typeAlias type="com.iamberry.rst.core.order.AfterrulesInfo" alias="AfterrulesInfo"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

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

@@ -369,10 +369,10 @@
                         }
                         var time = formatDate(new Date(salesOrder.salesPayTime),"yyyy-MM-dd");
                         var orderStatus = null;
-                        if(salesOrder.salesOrderStatus == 0){
+                        if(salesOrder.procTypeId == 0 || salesOrder.procTypeId == null || salesOrder.procTypeId == ""){
                             orderStatus = "正常";
                         }else{
-                            orderStatus = salesOrder.salesOrderStatusProcTypeName;
+                            orderStatus = salesOrder.procTypeName;
                         }
 
                         <#--1：正常 2：换货 3：退货  4:维修  5：补发-->

watero-rst-web/src/main/webapp/WEB-INF/views/order/afterrules_info.ftl

@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>售后信息</title>
+</head>
+<body>
+<div class="page-container">
+    <div class="text-c">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="50"><strong>售后方式</strong></th>
+                <td width="50">无理由退货</td>
+                <td width="50">质量问题退货期</td>
+                <td width="100">质量问题包换期</td>
+                <td width="100">质量问题-免费维修期</td>
+                <td width="100">付费维修期</td>
+            </tr>
+
+            </thead>
+            <tbody id="orderAll">
+            <tr class="text-c">
+                <th width="100">售后期限</strong></th>
+                <td width="100">${afterrulesInfo.returnReasonInfo!}</td>
+                <td width="100">${afterrulesInfo.qualityPeriodInfo!}</td>
+                <td width="100">${afterrulesInfo.warrantyProblemInfo!}</td>
+                <td width="100">${afterrulesInfo.governancePeriodInfo!}</td>
+                <td width="100">${afterrulesInfo.payRepairInfo!}</td>
+            </tr>
+            <tr class="text-c">
+                <th width="100"><strong>是否符合</strong></th>
+                <td width="100">
+                <#if afterrulesInfo.isReturnReason == 1><img src="/common/images/Conform.jpg"/></#if>
+                <#if afterrulesInfo.isReturnReason == 2><img src="/common/images/noConform.jpg"/></#if>
+                </td>
+                <td width="100">
+                <#if afterrulesInfo.isQualityPeriod == 1><img src="/common/images/Conform.jpg"/></#if>
+                <#if afterrulesInfo.isQualityPeriod == 2><img src="/common/images/noConform.jpg"/></#if>
+                </td>
+                <td width="100">
+                <#if afterrulesInfo.isWarrantyProblem == 1><img src="/common/images/Conform.jpg"/></#if>
+                <#if afterrulesInfo.isWarrantyProblem == 2><img src="/common/images/noConform.jpg"/></#if>
+                </td>
+                <td width="100">
+                <#if afterrulesInfo.isGovernancePeriod == 1><img src="/common/images/Conform.jpg"/></#if>
+                <#if afterrulesInfo.isGovernancePeriod == 2><img src="/common/images/noConform.jpg"/></#if>
+                </td>
+                <td width="100">
+                <#if afterrulesInfo.isPayRepair == 1><img src="/common/images/Conform.jpg"/></#if>
+                <#if afterrulesInfo.isPayRepair == 2><img src="/common/images/noConform.jpg"/></#if>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <br/>
+</div>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -252,6 +252,10 @@
                            onclick="acorrect_order(${order.salesId!''});">
                             <i class="Hui-iconfont">&#xe6f7;</i>
                         </a>
+                        <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
+                           onclick="getAfterrulesInfo(${order.salesId!''});">
+                            <i class="Hui-iconfont">&#xe63c;</i>
+                        </a>
                     </td>
                 </tr>
                 </#list>
@@ -873,11 +877,13 @@ function isConfirm(salesOrderIds,isSplit) {
          *跳转到更正订单页面
          * @param employee
          */
-        function acorrect_order(salesId) {
-
-           /* layer_show("客诉详情","${path}/admin/customer/_customer_info?salesId="+salesId,800,600);*/
+        function showAfterrulesInfo(salesId) {
              window.location.href= "${path}/admin/salesOrder/to_acorrect_order?salesId="+salesId;
         }
+
+        function getAfterrulesInfo(salesId){
+            layer_show("查看售后信息","${path}/admin/salesOrder/getAfterrulesInfo?salesId="+salesId,'570','450');
+        }
     </script>
 </body>
 </html>