直播订单导出功能

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

@@ -23,6 +23,7 @@ import com.fs.live.vo.LiveAfterSalesVo;
 import com.fs.store.domain.FsUser;
 import com.fs.store.param.*;
 import com.fs.store.service.IFsUserService;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -93,11 +94,17 @@ public class LiveAfterSalesController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:export')")
     @Log(title = "售后记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(LiveAfterSales liveAfterSales)
+    public AjaxResult export(LiveAfterSalesVo liveAfterSales)
     {
-        List<LiveAfterSales> list = liveAfterSalesService.selectLiveAfterSalesList(liveAfterSales);
-        ExcelUtil<LiveAfterSales> util = new ExcelUtil<LiveAfterSales>(LiveAfterSales.class);
-        return util.exportExcel(list, "售后记录数据");
+        PageHelper.clearPage();
+        PageHelper.startPage(1, 10000, "");
+        List<LiveAfterSalesVo> list = liveAfterSalesService.selectLiveAfterSalesVoList(liveAfterSales);
+        for (LiveAfterSalesVo liveAfterSalesVo : list) {
+            liveAfterSalesVo.setUserPhone(liveAfterSalesVo.getUserPhone() == null ? "" : liveAfterSalesVo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+            liveAfterSalesVo.setPhoneNumber(liveAfterSalesVo.getPhoneNumber() == null ? "" : liveAfterSalesVo.getPhoneNumber().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+        }
+        ExcelUtil<LiveAfterSalesVo> util = new ExcelUtil<LiveAfterSalesVo>(LiveAfterSalesVo.class);
+        return util.exportExcel(list, "销售直播退款订单数据");
     }
 
 

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

@@ -11,6 +11,7 @@ import com.fs.live.domain.LiveOrderPayment;
 import com.fs.live.service.ILiveOrderPaymentService;
 import com.fs.live.vo.LiveOrderPaymentVo;
 import com.fs.store.vo.FsStorePaymentVO;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -62,11 +63,15 @@ public class LiveOrderPaymentController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:order:payment:export')")
     @Log(title = "支付明细", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(LiveOrderPayment liveOrderPayment)
+    public AjaxResult export(LiveOrderPaymentVo liveOrderPayment)
     {
-        List<LiveOrderPayment> list = liveOrderPaymentService.selectLiveOrderPaymentList(liveOrderPayment);
-        ExcelUtil<LiveOrderPayment> util = new ExcelUtil<LiveOrderPayment>(LiveOrderPayment.class);
-        return util.exportExcel(list, "支付明细数据");
+        PageHelper.startPage(1, 10000, "");
+        List<LiveOrderPaymentVo> list = liveOrderPaymentService.selectLiveOrderPaymentVoList(liveOrderPayment);
+        for (LiveOrderPaymentVo vo : list){
+            vo.setUserPhone(vo.getUserPhone() == null ? "" : vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+        }
+        ExcelUtil<LiveOrderPaymentVo> util = new ExcelUtil<LiveOrderPaymentVo>(LiveOrderPaymentVo.class);
+        return util.exportExcel(list, "直播订单支付记录");
     }
 
     /**

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

@@ -19,6 +19,7 @@ import com.fs.live.service.ILiveOrderService;
 import com.fs.live.vo.LiveAfterSalesVo;
 import com.fs.store.domain.*;
 import com.fs.store.service.IFsUserService;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -67,11 +68,16 @@ public class LiveAfterSalesController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveAfteraSales:export')")
     @Log(title = "售后记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(LiveAfterSales liveAfterSales)
+    public AjaxResult export(LiveAfterSalesVo liveAfterSales)
     {
-        List<LiveAfterSales> list = liveAfterSalesService.selectLiveAfterSalesList(liveAfterSales);
-        ExcelUtil<LiveAfterSales> util = new ExcelUtil<LiveAfterSales>(LiveAfterSales.class);
-        return util.exportExcel(list, "售后记录数据");
+        PageHelper.startPage(1, 10000, "");
+        List<LiveAfterSalesVo> list = liveAfterSalesService.selectLiveAfterSalesVoList(liveAfterSales);
+        for (LiveAfterSalesVo liveAfterSalesVo : list) {
+            liveAfterSalesVo.setUserPhone(liveAfterSalesVo.getUserPhone() == null ? "" : liveAfterSalesVo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+            liveAfterSalesVo.setPhoneNumber(liveAfterSalesVo.getPhoneNumber() == null ? "" : liveAfterSalesVo.getPhoneNumber().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+        }
+        ExcelUtil<LiveAfterSalesVo> util = new ExcelUtil<LiveAfterSalesVo>(LiveAfterSalesVo.class);
+        return util.exportExcel(list, "销售直播退款订单数据");
     }
 
     /**

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

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

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

@@ -23,9 +23,21 @@ public class LiveOrderPaymentVo extends BaseEntity{
     private Long paymentId;
 
     /** 支付订单号 */
-    @Excel(name = "支付订单号")
+    @Excel(name = "付款单号")
     private String payCode;
 
+//    @Excel(name = "付款单号")
+    private Integer orderCode;
+
+    /** 外部订单号 */
+    @Excel(name = "外部订单号")
+    private String tradeNo;
+
+
+
+    @Excel(name = "会员手机号")
+    private String userPhone;
+
     /** 支付类型 weixin alipay */
     @Excel(name = "支付类型 weixin alipay")
     private String payTypeCode;
@@ -34,93 +46,107 @@ public class LiveOrderPaymentVo extends BaseEntity{
     @Excel(name = "支付金额")
     private BigDecimal payMoney;
 
+    /** 退款金额 */
+    @Excel(name = "退款金额")
+    private BigDecimal refundMoney;
+
+    /** 交易单号 */
+    @Excel(name = "交易单号")
+    private String bankTransactionId;
+
+    /** 银行流水号 */
+    @Excel(name = "银行单号")
+    private String bankSerialNo;
+
+
+    @Excel(name = "所属公司")
+    private String companyName;
+
+    @Excel(name = "所属部门")
+    private String deptName;
+
+    @Excel(name = "员工")
+    private String companyUserNickName;
+
+    /** 状态 0未支付 1已支付 -1 已退款 */
+    @Excel(name = "状态",readConverterExp = "0=未支付,1=已支付,-1=已退款")
+    private Integer status;
+
+    /** 支付方式: zb tz wx */
+    @Excel(name = "支付方式",dictType = "sys_pay_mode")
+    private String payMode;
+
+
+
+
+
     /** 支付时间 */
     @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 payTime;
 
-    /** 外部订单号 */
-    @Excel(name = "外部订单号")
-    private String tradeNo;
+
+    /** 退款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date refundTime;
+
+
 
     /** 用户ID */
-    @Excel(name = "用户ID")
+//    @Excel(name = "用户ID")
     private Long userId;
 
     /** OPENID */
-    @Excel(name = "OPENID")
+//    @Excel(name = "OPENID")
     private String openId;
 
     /** 业务类型  */
-    @Excel(name = "业务类型 ")
+//    @Excel(name = "业务类型 ")
     private Integer businessType;
 
     /** 关联业务ID */
-    @Excel(name = "关联业务ID")
+//    @Excel(name = "关联业务ID")
     private String businessId;
 
-    /** 状态 0未支付 1已支付 -1 已退款 */
-    @Excel(name = "状态 0未支付 1已支付 -1 已退款")
-    private Integer status;
 
-    /** 交易单号 */
-    @Excel(name = "交易单号")
-    private String bankTransactionId;
 
-    /** 银行流水号 */
-    @Excel(name = "银行流水号")
-    private String bankSerialNo;
-
-    /** 退款金额 */
-    @Excel(name = "退款金额")
-    private BigDecimal refundMoney;
-
-    /** 退款时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date refundTime;
 
     /** 店铺ID */
-    @Excel(name = "店铺ID")
+//    @Excel(name = "店铺ID")
     private Long storeId;
 
     /** 公司id */
-    @Excel(name = "公司id")
+//    @Excel(name = "公司id")
     private Long companyId;
 
     /** 员工id */
-    @Excel(name = "员工id")
+//    @Excel(name = "员工id")
     private Long companyUserId;
 
     /** 关联业务编号 */
-    @Excel(name = "关联业务编号")
+//    @Excel(name = "关联业务编号")
     private String businessCode;
 
-    /** 支付方式: zb tz wx */
-    @Excel(name = "支付方式: zb tz wx")
-    private String payMode;
+
 
     /** 分账状态 0未分账 1已分账 */
-    @Excel(name = "分账状态 0未分账 1已分账")
+//    @Excel(name = "分账状态 0未分账 1已分账",readConverterExp = "0=未分账,1=已分账")
     private Integer shareStatus;
 
     /** 分账单号 */
-    @Excel(name = "分账单号")
+//    @Excel(name = "分账单号")
     private String shareCode;
 
     /** 分账金额 */
-    @Excel(name = "分账金额")
+//    @Excel(name = "分账金额")
     private BigDecimal shareMoney;
 
     /** 是否分账 */
-    @Excel(name = "是否分账")
+//    @Excel(name = "是否分账")
     private Integer isShare;
 
-    private Integer orderCode;
-    private String userPhone;
-    private String companyName;
-    private String deptName;
-    private String companyUserNickName;
+
 
 
 }

fs-service-system/src/main/java/com/fs/store/vo/FsStorePaymentVO.java

@@ -58,7 +58,7 @@ public class FsStorePaymentVO implements Serializable
     private Integer status;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "下单金额", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     @Excel(name = "备注")
     private String remark;