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/OrderDetailVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index abca442..cfd077b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -1,6 +1,5 @@
package cc.mrbird.febs.mall.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +26,10 @@
@ApiModelProperty(value = "下单时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
+
+
+ @ApiModelProperty(value = "支付状态 1-支付成功 0-未支付")
+ private String payResult;
@ApiModelProperty(value = "支付方式")
private String payMethod;
@@ -74,7 +77,7 @@
private BigDecimal carriage;
@ApiModelProperty(value = "备注")
- private BigDecimal remark;
+ private String remark;
public Integer getPayMethodType() {
if (this.payMethod == null) {
@@ -124,5 +127,8 @@
private Integer deliveryState;
@ApiModelProperty(value = "是否送货上门 1：是 2：否")
private Integer isHome;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
--
Gitblit v1.9.1