From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderExport.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 e873738..c0ae923 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
@@ -14,7 +14,6 @@
@Excel(name = "订单状态" , readConverterExp = "3=待使用,4=已完成,5=已取消,8=已评价")
private String orderStatus;
-
/**
* 商户单号
*/
@@ -40,6 +39,7 @@
private String userName;
private Long appUserId;
+ private Integer shopId;
/**
* 联系方式
@@ -53,14 +53,20 @@
*/
@Excel(name = "商品名称")
private String goodsName;
+ /**
+ * 商品名称
+ */
+ @Excel(name = "店铺名称")
+ private String shopName;
/**
* 商品售价
*/
@Excel(name = "商品售价")
private BigDecimal sellingPrice;
+
@Excel(name = "支付方式",readConverterExp ="1=微信,2=账户余额,3=积分,4=组合")
- private Integer pay_method;
+ private String payMethod;
/**
* 支付金额
*/
@@ -71,11 +77,9 @@
private String point;
private String goodJson;
- /**
- * 商户号
- */
+
@Excel(name = "商户号")
- private String tradeMerchantNo = "729677708";
+ private String tradeMerchantNo = "1717539630";
/**
* 发货方式
--
Gitblit v1.7.1