From 8b39cf99c494a0683297fc17165b9a0fd4241f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 1 Oct 2025 19:24:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E5=AE=9E=E7=8E=B0=E5=94=AE?=
 =?UTF-8?q?=E7=94=B5=E4=BA=91=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95Excel?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8E=E7=BB=93=E7=AE=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增售电云分销订单控制器SdyDealerOrderController
- 实现Excel批量导入售电云分销订单功能
- 添加订单结算接口，支持更新结算状态和时间
- 创建售电云分销订单导入参数类SdyDealerOrderImportParam
- 在ShopDealerOrder实体中添加用户昵称和分销商昵称字段- 扩展ShopDealerOrderMapper.xml关联查询用户信息- 增加订单备注字段comments及查询条件支持- 实现通过经销商名称获取申请信息的方法getByDealerNameRel- 在导入逻辑中检查重复数据并跳过已存在记录
- 添加佣金比例rate和单价price字段支持
---
 .../param/ShopDealerOrderImportParam.java     | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderImportParam.java

diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderImportParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderImportParam.java
new file mode 100644
index 0000000..ee88898
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerOrderImportParam.java
@@ -0,0 +1,61 @@
+package com.gxwebsoft.shop.param;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 分销商订单记录表导入参数
+ *
+ * @author 科技小王子
+ * @since 2025-08-12 11:55:18
+ */
+@Data
+public class ShopDealerOrderImportParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "主键ID")
+    private Integer id;
+
+    @Excel(name = "买家用户ID")
+    private Integer userId;
+
+    @Excel(name = "订单ID")
+    private Integer orderId;
+
+    @Excel(name = "订单总金额")
+    private BigDecimal orderPrice;
+
+    @Excel(name = "一级分销商ID")
+    private Integer firstUserId;
+
+    @Excel(name = "二级分销商ID")
+    private Integer secondUserId;
+
+    @Excel(name = "三级分销商ID")
+    private Integer thirdUserId;
+
+    @Excel(name = "一级佣金")
+    private BigDecimal firstMoney;
+
+    @Excel(name = "二级佣金")
+    private BigDecimal secondMoney;
+
+    @Excel(name = "三级佣金")
+    private BigDecimal thirdMoney;
+
+    @Excel(name = "订单状态")
+    private Integer isInvalid;
+
+    @Excel(name = "结算状态")
+    private Integer isSettled;
+
+    @Excel(name = "结算时间")
+    private LocalDateTime settleTime;
+
+    @Excel(name = "租户ID")
+    private Integer tenantId;
+}