From 22531433c08788df27681cf2817486f8fee5d17e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 15:32:54 +0800
Subject: [PATCH] fix orderRefund
---
src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java | 16 ++++++++++++++++
src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java | 9 +++++++++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 6 ++++++
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java | 6 ++++++
sql/xc_mall.sql | 19 +++++++++++++++++++
5 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index d459688..01295a9 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -280,4 +280,23 @@
alter table mall_order_refund add before_status int null comment '订单退款前状态';
alter table mall_order_refund add refund_time datetime null comment '退款时间';
+DROP TABLE IF EXISTS mall_order_refund_address;
+CREATE TABLE mall_order_refund_address(
+ REVISION INT COMMENT '乐观锁' ,
+ CREATED_BY VARCHAR(32) COMMENT '创建人' ,
+ CREATED_TIME DATETIME COMMENT '创建时间' ,
+ UPDATED_BY VARCHAR(32) COMMENT '更新人' ,
+ UPDATED_TIME DATETIME COMMENT '更新时间' ,
+ ID BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键' ,
+ name VARCHAR(32) COMMENT '联系人' ,
+ phone VARCHAR(32) COMMENT '联系电话' ,
+ address TEXT COMMENT '地址' ,
+ PRIMARY KEY (ID)
+) COMMENT = '退货地址管理';
+
+alter table mall_order_refund add name varchar(32) null comment '联系人';
+alter table mall_order_refund add phone varchar(32) null comment '联系电话';
+alter table mall_order_refund add address text null comment '地址';
+
+
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index d62b898..0012e03 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -58,4 +58,10 @@
public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
return memberService.modifyMemberInfo(modifyMemberInfoDto);
}
+
+ @ApiOperation(value = "我的团队列表")
+ @PostMapping(value = "/teamList")
+ public FebsResponse teamList() {
+ return null;
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
index 25de594..0989a1f 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
@@ -44,4 +44,10 @@
private Integer beforeStatus;
private Date refundTime;
+
+ private String name;
+
+ private String phone;
+
+ private String address;
}
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 3c25cdc..be3cd64 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
@@ -37,4 +37,13 @@
@ApiModelProperty(value = "退款时间")
private Date refundTime;
+
+ @ApiModelProperty(value = "收货联系人")
+ private String name;
+
+ @ApiModelProperty(value = "收货联系电话")
+ private String phone;
+
+ @ApiModelProperty(value = "收货地址")
+ private String address;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
new file mode 100644
index 0000000..901df1c
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
@@ -0,0 +1,16 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2021-09-24
+ **/
+@Data
+@ApiModel(value = "TeamListVo", description = "团队列表返回参数类")
+public class TeamListVo {
+
+ private Long id;
+
+}
--
Gitblit v1.9.1