From a1ae9d712f1d18799c3e4e34995fd037f6c5a22a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Jul 2023 16:56:32 +0800
Subject: [PATCH] 商城商品修改
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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 9af4821..ba17b61 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;
/**
@@ -24,6 +24,7 @@
**/
@Slf4j
@Validated
+@CrossOrigin("*")
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/api/order")
@@ -31,6 +32,13 @@
public class ApiMallOrderController {
private final IApiMallOrderInfoService mallOrderInfoService;
+ private final IXcxPayService iXcxPayService;
+
+ @ApiOperation(value = "创建订单--验证是否允许创建", notes = "创建订单--验证是否允许创建")
+ @PostMapping(value = "/createOrderVerify")
+ public FebsResponse createOrderVerify(@RequestBody ApiCreateOrderVerifyDto apiCreateOrderVerifyDto) {
+ return mallOrderInfoService.createOrderVerify(apiCreateOrderVerifyDto);
+ }
@ApiOperation(value = "创建订单", notes = "创建订单")
@PostMapping(value = "/createOrder")
@@ -90,6 +98,24 @@
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 = "/applyRefundOrder")
+ public FebsResponse applyRefundOrder(@RequestBody ApplyRefundOrderDto applyRefundOrderDto) {
+ return mallOrderInfoService.applyRefundOrder(applyRefundOrderDto);
+ }
+
+ @ApiOperation(value = "用户退款--取消退款申请", notes = "用户退款--取消退款申请")
+ @PostMapping(value = "/cancelRefundOrder/{id}")
+ public FebsResponse cancelRefundOrder(@PathVariable("id") Long id) {
+ return mallOrderInfoService.cancelRefundOrder(id);
+ }
+
@ApiOperation(value = "提交退款申请", notes = "提交退款申请")
@PostMapping(value = "/applyRefund")
public FebsResponse applyRefund(@RequestBody AddRefundDto addRefundDto) {
@@ -103,4 +129,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