From 47e03d0aa72b6bd1c62c4ecff0c25289890f7abc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 10:49:17 +0800
Subject: [PATCH] refactor(mall): 根据系统配置选择不同的物流服务接口 - 在 AdminMallOrderService 和 CommonService 中添加了根据系统配置选择物流服务接口的逻辑 - 新增了 SENDER_STATE 数据字典项,用于控制使用测试环境还是生产环境的物流服务 - 根据系统配置,选择不同的 ClientParamEnum 实例来调用

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
index 85089a9..a1a4923 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -33,4 +33,34 @@
 
     @ApiModelProperty(value = "订单明细")
     private List<OrderItemVo> items;
+
+    @ApiModelProperty(value = "订单类型 1-普通订单 2-积分订单")
+    private Integer orderType;
+
+    @ApiModelProperty(value = "运费")
+    private BigDecimal carriage;
+
+    @ApiModelProperty(value = "评价状态 1:待评价 2:已评价")
+    private Integer commentState;
+
+    @ApiModelProperty(value = "提货码")
+    private String takeCode;
+
+    @ApiModelProperty(value = "提货人姓名")
+    private String name;
+
+    @ApiModelProperty(value = "提货人电话")
+    private String phone;
+
+    @ApiModelProperty(value = "配送状态 1:待配送 2:配送中 3:已送达")
+    private Integer deliveryState;
+
+    @ApiModelProperty(value = "是否送货上门  1:是 2:否")
+    private Integer isHome;
+
+    @ApiModelProperty(value = "快递单号")
+    private String expressNo;
+
+    @ApiModelProperty(value = "是否赠送 1-是 2-否")
+    private Integer isFree;
 }

--
Gitblit v1.9.1