From db048fa114cbad7708c17c1d75639d9e06271011 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 24 十一月 2022 17:18:27 +0800
Subject: [PATCH] #feat 调试问题修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index b0e2858..6127ca3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -160,7 +160,7 @@
return communityService.orderCreateFlower(orderCreateDTO);
}
- @ApiOperation(value = "分页查询订单列表", response = ComShopOrderPageVO.class)
+ @ApiOperation(value = "分页查询订单列表", response = ComShopFlowerOrderPageVO.class)
@PostMapping("pageOrderList")
public R pageOrderList(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -171,8 +171,8 @@
return communityService.pageOrderListFlower(comOrderListDTO);
}
- @ApiOperation(value = "查询订单详情", response = ComShopOrderPageVO.class)
- @PostMapping("orderDetail")
+ @ApiOperation(value = "查询订单详情", response = ComShopFlowerOrderPageVO.class)
+ @GetMapping("orderDetail")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDetail(@RequestParam("orderId") Long orderId) {
return communityService.orderDetailFlower(orderId);
@@ -189,10 +189,10 @@
}
@ApiOperation(value = "删除订单")
- @PostMapping("orderDelete")
+ @DeleteMapping("orderDelete")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDelete(@RequestParam("orderId") Long orderId) {
- return communityService.orderDelete(orderId);
+ return communityService.orderDeleteFlower(orderId);
}
@ApiOperation(value = "订单确认收货")
@@ -247,6 +247,7 @@
return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
+ comShopFlowerEvaluateDTO.setUserId(this.getUserId());
return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
}
@@ -391,6 +392,7 @@
@PostMapping("createRefundOrder")
@ApiOperation(value = "创建退款订单")
public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
+ comShopFlowerRefundOrderDTO.setUserId(this.getUserId());
return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
}
@@ -403,7 +405,9 @@
@PostMapping("pageRefundOrder")
@ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
- pageComOrderRefundDTO.setUserId(this.getUserId());
+ if (null == pageComOrderRefundDTO.getStoreId()){
+ pageComOrderRefundDTO.setUserId(this.getUserId());
+ }
return communityService.pageRefundOrder(pageComOrderRefundDTO);
}
@@ -485,4 +489,27 @@
public R getQuota(@RequestParam("storeId") Long storeId){
return communityService.getQuota(storeId);
}
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取消退款")
+ @GetMapping("refundOrderCancel")
+ public R refundOrderCancel(@RequestParam("id") Long id){
+ return communityService.refundOrderCancel(id);
+ }
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "退款订单详情",response = ComShopFlowerRefundOrderVO.class)
+ @GetMapping("refundOrderDetail")
+ public R refundOrderDetail(Long id){
+ return communityService.refundOrderDetail(id);
+ }
+
}
--
Gitblit v1.7.1