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/OrderRefundVo.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java index c320147..ad1a93f 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java @@ -1,8 +1,11 @@ package cc.mrbird.febs.mall.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; /** * @author wzy @@ -24,9 +27,31 @@ @ApiModelProperty(value = "退款状态 1-已申请 2-同意退款 3-驳回退款 4-已提交物流信息 5-已退款 6-已取消") private Integer status; + @ApiModelProperty(value = "1-仅退款 2-退款退货") + private Integer type; + @ApiModelProperty(value = "物流单号") private String expressNo; @ApiModelProperty(value = "物流公司") private String expressCom; + + @ApiModelProperty(value = "退款时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date refundTime; + + @ApiModelProperty(value = "收货联系人") + private String name; + + @ApiModelProperty(value = "收货联系电话") + private String phone; + + @ApiModelProperty(value = "收货地址") + private String address; + + @ApiModelProperty(value = "退款前状态") + private Integer beforeStatus; + + @ApiModelProperty(value = "退款金额") + private Integer amount; } -- Gitblit v1.9.1