fs-service-system/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -108,7 +108,7 @@ public class LiveOrder extends BaseEntity {
     private String payType;
 
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：已取消 1：待支付 2：待发货；3：待收货；4：待评价；5：已完成） */
-    @Excel(name = "订单状态", dictType = "store_order_status")
+    @Excel(name = "订单状态", dictType = "sys_order_status")
     private Integer status;
 
     @Excel(name = "交易单号")

fs-service-system/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -180,6 +180,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
                     FsStoreDelivers delivers = byOrderIdWithType.get(0);
                     item.setDeliveryStatus(String.valueOf(delivers.getStatus()));
                     item.setDeliveryId(delivers.getDeliverId());
+
                 }
             }
 

fs-service-system/src/main/java/com/fs/live/vo/LiveAfterSalesVo.java

@@ -25,42 +25,46 @@ public class LiveAfterSalesVo {
     /** 店铺ID */
 //    @Excel(name = "店铺ID")
     private Long storeId;
+    /** 订单ID */
+    @Excel(name = "订单ID")
+    private Long orderId;
 
-    @Excel(name = "公司名称")
+    @Excel(name = "所属公司")
     private String companyName;
-    @Excel(name = "销售名称")
+    @Excel(name = "所属销售")
     private String companyUserNickName;
 
-    @Excel(name = "订单单号")
-    private String orderCode;
-
     @Excel(name = "会员手机号")
     private String userPhone;
 
-    /** 订单ID */
-//    @Excel(name = "订单ID")
-    private Long orderId;
-
     /** 退款金额 */
     @Excel(name = "退款金额")
     private BigDecimal refundAmount;
 
+
+    @Excel(name = "订单单号")
+    private String orderCode;
+
+
     /** 服务类型0仅退款1退货退款 */
-    @Excel(name = "服务类型",readConverterExp = "0=仅退款,1=退货退款")
+    @Excel(name = "退款类型",readConverterExp = "0=仅退款,1=退货退款")
     private Integer refundType;
-
     /** 申请原因 */
     @Excel(name = "申请原因")
     private String reasons;
 
+
+
     /** 说明 */
     @Excel(name = "说明")
     private String explains;
 
     /** 说明图片->多个用逗号分割 */
-    @Excel(name = "说明图片;多个用逗号分割")
+//    @Excel(name = "说明图片;多个用逗号分割")
     private String explainImg;
-
+    /** 状态 0已提交等待平台审核 1平台已审核 等待用户发货 2 用户已发货待仓库审核 3财务审核 4退款成功 */
+    @Excel(name = "状态",dictType = "store_after_sales_status")
+    private Integer status;
 
     /** 售后状态 0售后中 1用户取消2商家拒绝 3已完成 */
     @Excel(name = "售后状态", dictType = "store_after_sales_sales_status")
@@ -77,50 +81,45 @@ public class LiveAfterSalesVo {
     private String deliveryStatus;
 
 
-    /** 物流单号 */
+    /**
+     * 物流单号
+     */
     @Excel(name = "物流单号")
-    private String deliverySn;
+    private String deliveryId;
 
 
+    /** 物流单号 */
+    @Excel(name = "客户退回物流单号")
+    private String deliverySn;
+
 
     /** 物流公司编码 */
-    @Excel(name = "物流公司编码")
     private String deliveryCode;
 
-
     /** 物流名称 */
-    @Excel(name = "物流名称")
+    @Excel(name = "退货物流名称")
     private String deliveryName;
 
 
-
-    /** 状态 0已提交等待平台审核 1平台已审核 等待用户发货 2 用户已发货待仓库审核 3财务审核 4退款成功 */
-    @Excel(name = "状态",dictType = "store_after_sales_status")
-    private Integer status;
-
-
-
-
-
     /** 逻辑删除 */
     private Integer isDel;
 
     /** 用户id */
-    @Excel(name = "用户id")
+//    @Excel(name = "用户id")
     private Long userId;
 //    @Excel(name = "用户名称")
     private String userName;
 
     /** 商家收货人 */
-    @Excel(name = "商家收货人")
+//    @Excel(name = "商家收货人")
     private String consignee;
 
     /** 商家手机号 */
-    @Excel(name = "商家手机号")
+//    @Excel(name = "商家手机号")
     private String phoneNumber;
 
     /** 商家地址 */
-    @Excel(name = "商家地址")
+//    @Excel(name = "商家地址")
     private String address;
 
     /** $column.columnComment */
@@ -136,15 +135,10 @@ public class LiveAfterSalesVo {
     private Long deptId;
 
     /** 创建时间 */
-    @Excel(name = "下单时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "提交时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
 
 
-    /**
-     * 物流单号
-     */
-    private String deliveryId;
-
 }