直播订单导出功能

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -121,6 +121,10 @@ public class LiveOrderController extends BaseController
     public AjaxResult export(LiveOrder liveOrder)
     {
         List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
+        for (LiveOrder order : list) {
+            order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
+            order.setUserAddress(ParseUtils.parseAddress(order.getUserPhone()));
+        }
         ExcelUtil<LiveOrder> util = new ExcelUtil<LiveOrder>(LiveOrder.class);
         return util.exportExcel(list, "订单数据");
     }

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -206,6 +206,10 @@ public class LiveOrderController extends BaseController
     public AjaxResult export(LiveOrder liveOrder)
     {
         List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
+        for (LiveOrder order : list) {
+            order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
+            order.setUserAddress(ParseUtils.parseAddress(order.getUserPhone()));
+        }
         ExcelUtil<LiveOrder> util = new ExcelUtil<LiveOrder>(LiveOrder.class);
         return util.exportExcel(list, "订单数据");
     }

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

@@ -26,7 +26,7 @@ public class LiveOrder extends BaseEntity {
     private Long liveId;
 
     /** $column.columnComment */
-    @Excel(name = "店铺ID")
+//    @Excel(name = "店铺ID")
     private Long storeId;
 
     @Excel(name = "商品id")
@@ -73,7 +73,7 @@ public class LiveOrder extends BaseEntity {
     private BigDecimal payMoney;
 
     /** 支付状态 待支付 1已支付 */
-    @Excel(name = "支付状态 待支付 1已支付")
+    @Excel(name = "支付状态",readConverterExp = "待支付=0,已支付=1")
     private String isPay;
 
     /** 取消理由*/
@@ -91,15 +91,15 @@ public class LiveOrder extends BaseEntity {
     private String payEndTime;
 
     /** 支付方式 1微信 */
-    @Excel(name = "支付方式 1微信")
+    @Excel(name = "支付方式", readConverterExp = "微信=1")
     private String payType;
 
     /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：已取消 1：待支付 2：待发货；3：待收货；4：待评价；5：已完成） */
-    @Excel(name = "订单状态", readConverterExp = "-=1,:=,申=请退款,-=2,:=,退=货成功,1=：待支付,2=：待发货；3：待收货；4：待评价；5：已完成")
+    @Excel(name = "订单状态", dictType = "store_order_status")
     private Integer status;
 
     /** 0 未退款 1 申请中 2 已退款 */
-    @Excel(name = "0 未退款 1 申请中 2 已退款")
+    @Excel(name = "退款状态",readConverterExp = "未退款=0,申请中=1,已退款=2")
     private String refundStatus;
 
     /** 退款图片 */
@@ -112,7 +112,7 @@ public class LiveOrder extends BaseEntity {
 
     /** 退款时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date refundTime;
 
     /** 不退款的理由 */
@@ -148,7 +148,7 @@ public class LiveOrder extends BaseEntity {
     private String verifyCode;
 
     /** 配送方式 1=快递 ，2=门店自提 */
-    @Excel(name = "配送方式 1=快递 ，2=门店自提")
+    @Excel(name = "配送方式",readConverterExp = "快递=1,门店自提=2")
     private Integer shippingType;
 
     /** 支付渠道(1微信小程序) */
@@ -157,7 +157,7 @@ public class LiveOrder extends BaseEntity {
 
     /** $column.columnComment */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "支付渠道(1微信小程序)", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date finishTime;
 
     // 完成时间-开始
@@ -174,7 +174,7 @@ public class LiveOrder extends BaseEntity {
     private BigDecimal tuiMoney;
 
     /** 推广佣金状态 1已发放 0待发放 */
-    @Excel(name = "推广佣金状态 1已发放 0待发放")
+    @Excel(name = "推广佣金状态",readConverterExp = "已发放=1,待发放=0")
     private Integer tuiMoneyStatus;
 
     /** 上级推荐人ID */
@@ -194,13 +194,18 @@ public class LiveOrder extends BaseEntity {
     private Long userCouponId;
 
     /** 公司id */
-    @Excel(name = "公司id")
+//    @Excel(name = "公司id")
     private Long companyId;
 
     /** 公司员工id */
-    @Excel(name = "公司员工id")
+//    @Excel(name = "公司员工id")
     private Long companyUserId;
 
+    @Excel(name = "公司名称")
+    private String companyName;
+    @Excel(name = "销售名称")
+    private String companyUserName;
+
     /** 仓库代码 */
     @Excel(name = "仓库代码")
     private String storeHouseCode;
@@ -218,7 +223,7 @@ public class LiveOrder extends BaseEntity {
     private BigDecimal payRemain;
 
     /** 物流状态 */
-    @Excel(name = "物流状态")
+    @Excel(name = "物流状态",dictType = "store_order_delivery_status")
     private Integer deliveryStatus;
 
     /** 物流结算状态 */
@@ -239,7 +244,7 @@ public class LiveOrder extends BaseEntity {
 
     /** 回单导入时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "回单导入时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "回单导入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryImportTime;
 
     /** 发货时间 */
@@ -322,8 +327,7 @@ public class LiveOrder extends BaseEntity {
     /** 城市Id*/
     private Long cityId;
 
-    private String companyName;
-    private String companyUserName;
+
 
     private Long customerId;
     private Long couponUserId;