From 4ce960adbb7355ac75efcd03705f58f923ecdbd6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Aug 2022 11:21:13 +0800
Subject: [PATCH] 20220808

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

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 d44f7d1..92f5254 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -50,10 +49,10 @@
     @ApiOperation(value = "支付订单", notes = "支付订单")
     @PostMapping(value = "/payOrder")
     public FebsResponse payOrder(@RequestBody PayOrderDto payOrderDto) {
-        String result = mallOrderInfoService.payOrder(payOrderDto);
+        Map<String, Object> result = mallOrderInfoService.payOrder(payOrderDto);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("orderNo", result);
+        map.put("order", result);
         map.put("type", payOrderDto.getType());
         return new FebsResponse().success().data(map).message("支付成功");
     }
@@ -86,7 +85,14 @@
     @ApiOperation(value = "删除订单", notes = "删除订单")
     @PostMapping(value = "/delOrder/{id}")
     public FebsResponse delOrder(@PathVariable("id") Long id) {
-        return null;
+        mallOrderInfoService.delOrder(id);
+        return new FebsResponse().success().message("删除成功");
+    }
+
+    @ApiOperation(value = "用户退款", notes = "用户退款")
+    @PostMapping(value = "/refundOrder/{id}")
+    public FebsResponse refundOrder(@PathVariable("id") Long id) {
+        return mallOrderInfoService.refundOrder(id);
     }
 
     @ApiOperation(value = "提交退款申请", notes = "提交退款申请")
@@ -102,4 +108,12 @@
         mallOrderInfoService.refundExpress(refundExpressDto);
         return new FebsResponse().success().message("提交成功");
     }
+
+    @ApiOperation(value = "评价", notes = "评价")
+    @PostMapping(value = "/goodsComment")
+    public FebsResponse goodsComment(@RequestBody ApiAddCommentDtos addCommentDtos) {
+        mallOrderInfoService.goodsComment(addCommentDtos);
+        return new FebsResponse().success().message("评价成功");
+    }
+
 }

--
Gitblit v1.9.1