From 2585d6876ad025bb24634f729b4196d52f77744b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 17 八月 2024 17:29:56 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
index 839b382..bea875b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java
@@ -1,9 +1,19 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TActivity;
+import com.ruoyi.other.api.domain.TGoods;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
+import com.ruoyi.other.api.dto.GoodsDTO;
+import com.ruoyi.other.service.TActivityService;
+import com.ruoyi.other.service.TAdvertisingService;
+import com.ruoyi.other.service.TGoodsService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -16,6 +26,48 @@
@RestController
@RequestMapping("/t-goods")
public class TGoodsController {
-
+ @Autowired
+ private TGoodsService goodsService;
+ @Autowired
+ private TActivityService activityService;
+ @PostMapping("/saveGoods")
+ @ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
+ public AjaxResult saveActivity(@RequestBody TGoods dto) {
+ goodsService.save(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/delete")
+ @ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
+ public AjaxResult delete(Integer id) {
+ goodsService.removeById(id);
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateVip")
+ @ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
+ public AjaxResult updateActivity(@RequestBody TGoods dto) {
+ goodsService.updateById(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/getInfo")
+ @ApiOperation(tags = {"管理后台-商品管理"},value = "商品查看详情")
+ public AjaxResult<TGoods> getInfo(Integer id) {
+ return AjaxResult.ok(goodsService.getById(id));
+ }
+ @ApiOperation(tags = {"管理后台-商品管理"},value = "商品列表分页查询")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TGoods>> pageList(@RequestBody GoodsDTO dto) {
+ return AjaxResult.ok(goodsService.pageList(dto));
+ }
+
+ /**
+ * 根据id获取商品信息
+ * @param id
+ * @return
+ */
+ @PostMapping("/getGoodsById/{id}")
+ public R<TGoods> getGoodsById(@PathVariable Integer id){
+ TGoods goods = goodsService.getById(id);
+ return R.ok(goods);
+ }
}
--
Gitblit v1.7.1