From 2812309093cc6fd31a75d10f62bc52abb7588f56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 06 Jan 2025 17:16:57 +0800
Subject: [PATCH] feat(mall): 后台活动列表添加分页和搜索功能 - 在 ActivityServiceImpl 中实现 getAdminListInPage 方法，支持分页和搜索 - 在 AdminActivityController 中添加 list 接口，返回分页数据 - 在 IActivityService 中定义 getAdminListInPage 接口 - 更新前端模板，根据活动状态控制按钮显示
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 92f5254..bdb6196 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;
@@ -30,6 +31,19 @@
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 = "/chooseCoupon")
+ public FebsResponse chooseCoupon(@RequestBody ApiChooseCouponDto chooseCouponDto) {
+ return mallOrderInfoService.chooseCoupon(chooseCouponDto);
+ }
@ApiOperation(value = "创建订单", notes = "创建订单")
@PostMapping(value = "/createOrder")
@@ -95,6 +109,18 @@
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) {
@@ -116,4 +142,10 @@
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