订单导出

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsDayController.java

@@ -53,7 +53,7 @@ public class TJsDayController extends BaseController {
 
     @Log(title = "技师统计信息导出", businessType = BusinessType.EXPORT)
     @ApiOperation("导出")
-    @RequestMapping(value = "export", method = RequestMethod.GET)
+    @RequestMapping(value = "export", method = RequestMethod.POST)
     public void export(HttpServletResponse response, Page<TJsDay> page, TJsDay tJsDay) {
         Page<TJsDay> day = this.tJsDayService.page(page, new QueryWrapper<>(tJsDay));
         ExcelUtil<TJsDay> util = new ExcelUtil<TJsDay>(TJsDay.class);

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -17,10 +17,7 @@ import com.ylx.massage.service.TOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import javax.annotation.Resource;
@@ -256,10 +253,10 @@ public class TOrderController {
 
     @Log(title = "微信获取订单信息", businessType = BusinessType.EXPORT)
     @ApiOperation("导出")
-    @RequestMapping(value = "wx/export", method = RequestMethod.GET)
+    @PostMapping(value = "wx/export")
     public void export(HttpServletResponse response, Page<TOrder> page, TOrder param) {
         Page<TOrder> all = orderService.getAll(page, param);
-        ExcelUtil<TOrder> util = new ExcelUtil<TOrder>(TOrder.class);
+        ExcelUtil<TOrder> util = new ExcelUtil<>(TOrder.class);
         util.exportExcel(response, all.getRecords(), "订单");
     }
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.ylx.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -43,6 +44,7 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师id")
     private String cJsId;
 
+    @Excel(name = "订单号")
     @TableField("order_no")
     @ApiModelProperty("订单号")
     private String orderNo;
@@ -163,6 +165,7 @@ public class TOrder implements Serializable {
     /**
      * 总价
      */
+    @Excel(name = "订单金额")
     @TableField("total_price")
     @ApiModelProperty("总价")
     private BigDecimal totalPrice;
@@ -187,6 +190,7 @@ public class TOrder implements Serializable {
     /**
      * 姓名
      */
+    @Excel(name = "用户姓名")
     @TableField("c_name")
     @ApiModelProperty("姓名")
     private String cName;
@@ -194,6 +198,7 @@ public class TOrder implements Serializable {
     /**
      * 电话
      */
+    @Excel(name = "用户电话")
     @TableField("c_phone")
     @ApiModelProperty("电话")
     private String cPhone;
@@ -222,6 +227,7 @@ public class TOrder implements Serializable {
     /**
      * 创建时间
      */
+    @Excel(name = "时间")
     @TableField("dt_create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
@@ -242,10 +248,12 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师昵称")
     private String cNickName;
 
+    @Excel(name = "技师姓名")
     @TableField(exist = false)
     @ApiModelProperty("技师姓名")
     private String jsName;
 
+    @Excel(name = "技师电话")
     @TableField(exist = false)
     @ApiModelProperty("技师手机")
     private String jsPhone;
@@ -255,6 +263,7 @@ public class TOrder implements Serializable {
     private TWxUser wxUser;
 
     @TableField(exist = false)
+    @Excel(name = "订单状态")
     @ApiModelProperty("订单状态名称")
     private String statusName;