From 5891fbcb6a2cb662c24c379e6368f13293e6b0c2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Sep 2021 18:36:23 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 7 +++++++
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java | 2 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 13 +++++++++++++
sql/xc_mall.sql | 2 ++
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 5 +++++
5 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index 736c82c..89585f9 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -241,3 +241,5 @@
PRIMARY KEY (ID)
) COMMENT = '物流信息表';
+alter table mall_order_info add receiving_time datetime null comment '收货时间';
+
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
index f7d55db..4902ff1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -78,4 +78,11 @@
return new FebsResponse().success().data(mallOrderInfoService.findOrderDetailsById(id));
}
+ @ApiOperation(value = "确认收货", notes = "确认收货")
+ @PostMapping(value = "/confirm/{id}")
+ public FebsResponse confirm(@PathVariable("id") Long id) {
+ mallOrderInfoService.confirmOrder(id);
+ return new FebsResponse().success().message("确认成功");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index cce3092..2503623 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -62,6 +62,11 @@
*/
private Integer delFlag;
+ /**
+ * 确认收货时间
+ */
+ private Date receivingTime;
+
@TableField(exist = false)
private List<MallOrderItem> items;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
index b554ee1..fc62ef8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java
@@ -21,4 +21,6 @@
List<OrderListVo> findOrderList(OrderListDto orderListDto);
OrderDetailVo findOrderDetailsById(Long id);
+
+ void confirmOrder(Long id);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d1b9405..5addc71 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -191,4 +191,17 @@
}
return orderDetailVo;
}
+
+ @Override
+ public void confirmOrder(Long id) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+ if (orderInfo == null) {
+ throw new FebsException("订单不存在");
+ }
+
+ orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
+ orderInfo.setReceivingTime(new Date());
+ this.baseMapper.updateById(orderInfo);
+ }
}
--
Gitblit v1.9.1