From 49306af1995aec6264410e624bb91db6876f666a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 10:34:47 +0800
Subject: [PATCH] fix(mall):修复小程序登录时公司ID查询错误 - 将查询条件从 apiXcxLoginDto.getCode() 更正为 apiXcxLoginDto.getCompanyId() - 确保公司信息查询使用正确的参数 - 修复因参数错误导致的公司信息无法正确获取的问题
---
src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 24b70e1..9b09c26 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -25,12 +25,45 @@
@ApiModelProperty(value = "下单时间")
private Date orderTime;
- @ApiModelProperty(value = "状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消")
+ @ApiModelProperty(value = "状态 1-待支付 2-待发货 3-待收货 4-已完成 5-退款中 6-退款处理完成 7-已取消")
private Integer status;
+ //支付积分
+ @ApiModelProperty(value = "订单积分")
+ private BigDecimal scoreAmount;
@ApiModelProperty(value = "订单金额")
private BigDecimal amount;
@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