From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 166 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
index e5aac0d..d521575 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java
@@ -1,5 +1,171 @@
 package com.ruoyi.order.vo;
 
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
 public class OrderExport {
 
+    /**
+     * 订单状态
+     */
+    @Excel(name = "订单状态" , readConverterExp = "1=待发货,2=待收货,3=待使用,4=已完成,5=已取消,6=已退款,7=售后中,8=已评价")
+    private String orderStatus;
+
+
+    /**
+     * 交易单号
+     */
+    @Excel(name = "交易单号")
+    private String serialNumber;
+
+    /**
+     * 商户单号
+     */
+    @Excel(name = "商户单号")
+    private String orderNumber;
+
+    /**
+     * 商户号
+     */
+    @Excel(name = "商户号")
+    private String tradeMerchantNo = "729677708";
+
+    /**
+     * 发货方式
+     */
+    @Excel(name = "发货方式", readConverterExp = "1=快递,2=自提")
+    private String distributionMode;
+
+    /**
+     * 发货模式
+     */
+    @Excel(name = "发货模式")
+    private String deliveryMode = "统一发货";
+
+
+    /**
+     * 是否完成发货
+     */
+    @Excel(name = "是否完成发货")
+    private String isDelivery;
+
+    /**
+     * 是否重新发货
+     */
+    @Excel(name = "是否重新发货")
+    private String isReDelivery;
+
+
+    /**
+     * 订单类型
+     */
+    @Excel(name = "订单类型", readConverterExp = "1=服务,2=单品(自提),3=单品(快递)")
+    private String orderType;
+
+
+
+    /**
+     * 收货地址
+     */
+    @Excel(name = "收货地址")
+    private String address;
+
+    /**
+     * 下单时间
+     */
+    @Excel(name = "下单时间")
+    private String createTime;
+
+    /**
+     * 下单用户
+     */
+    @Excel(name = "下单用户")
+    private String userName;
+
+    private Long appUserId;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String phone;
+
+    /**
+     * 商品名称
+     */
+    @Excel(name = "商品名称")
+    private String goodsName;
+
+    /**
+     * 商品售价
+     */
+    @Excel(name = "商品售价")
+    private BigDecimal sellingPrice;
+
+    /**
+     * 成本价
+     */
+    @Excel(name = "公司运营成本")
+    private BigDecimal companyCostPrice;
+
+    /**
+     * 成本价
+     */
+    @Excel(name = "门店、供应商成本")
+    private BigDecimal supplierCostPrice;
+
+    /**
+     * 支付金额
+     */
+    @Excel(name = "支付金额")
+    private String orderMoney;
+
+    /**
+     * 快递单号
+     */
+    @Excel(name = "快递单号")
+    private String expressNum;
+
+    private String expressJson;
+
+    private String goodJson;
+
+    /**
+     * 快递公司
+     */
+    @Excel(name = "快递公司")
+    private String expressName;
+
+    /**
+     * 省
+     */
+    @Excel(name = "省")
+    private String province;
+
+    /**
+     * 省区划代码
+     */
+    @Excel(name = "省区划代码")
+    private String provinceCode;
+
+    /**
+     * 市
+     */
+    @Excel(name = "市")
+    private String city;
+
+    /**
+     * 市区划代码
+     */
+    @Excel(name = "市区划代码")
+    private String cityCode;
+
+    private String addressJson;
+
+
+
+
 }

--
Gitblit v1.7.1