From e8f8d89a4248cd4d0a7138cc2e5a36ea9b136699 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 11 Feb 2025 17:03:01 +0800
Subject: [PATCH] feat(mall): 添加订单一键发货和取消发货功能
---
src/main/java/cc/mrbird/febs/mall/controller/ViewActivityController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewActivityController.java
index df94ef3..89ae14c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewActivityController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewActivityController.java
@@ -2,9 +2,15 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.entity.MallActivity;
import cc.mrbird.febs.mall.service.IActivityService;
import lombok.RequiredArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller("activityView")
@@ -14,4 +20,39 @@
private final IActivityService iActivityService;
+
+ /**
+ * 列表
+ */
+ @GetMapping("list")
+ @RequiresPermissions("list:view")
+ public String activityList() {
+ return FebsUtil.view("modules/activity/list");
+ }
+
+ /**
+ * 新增
+ */
+ @GetMapping("add")
+ @RequiresPermissions("add:add")
+ public String activityAdd() {
+ return FebsUtil.view("modules/activity/add");
+ }
+
+ /**
+ * 修改
+ */
+ @GetMapping("activityUpdate/{id}")
+ @RequiresPermissions("activityUpdate:update")
+ public String activityUpdate(@PathVariable long id, Model model) {
+ MallActivity mallActivity = iActivityService.getBaseMapper().selectById(id);
+ model.addAttribute("activity", mallActivity);
+ if(mallActivity.getType() == 1){//折扣页面
+ return FebsUtil.view("modules/activity/discountUpdate");
+ }else if(mallActivity.getType() == 2){//优惠卷页面
+ return FebsUtil.view("modules/activity/couponUpdate");
+ }else{
+ return FebsUtil.view("error/404");
+ }
+ }
}
--
Gitblit v1.9.1