From 235321c179c5b8ed1528ce99428c469a8c66c1c5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Aug 2022 14:47:45 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 3005441..929b34d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.pay.service.IXcxPayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -15,7 +16,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -31,6 +31,7 @@
public class ApiMallOrderController {
private final IApiMallOrderInfoService mallOrderInfoService;
+ private final IXcxPayService iXcxPayService;
@ApiOperation(value = "创建订单", notes = "创建订单")
@PostMapping(value = "/createOrder")
@@ -50,10 +51,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("支付成功");
}
@@ -90,6 +91,12 @@
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 = "提交退款申请")
@PostMapping(value = "/applyRefund")
public FebsResponse applyRefund(@RequestBody AddRefundDto addRefundDto) {
@@ -103,4 +110,18 @@
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("评价成功");
+ }
+
+ @ApiOperation(value = "获取微信订阅TemplateId")
+ @GetMapping(value = "/getTemplateId")
+ public FebsResponse getTemplateId() {
+ return new FebsResponse().success().data(iXcxPayService.getTemplateId());
+ }
+
}
--
Gitblit v1.9.1