From 6682d7c793f4a49bf13bf2f8a0170f188a701342 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 03 十一月 2025 21:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
index 91e1e8c..ff8e719 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BaseModel;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.ExchangeGoodsDto;
import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto;
@@ -119,6 +121,7 @@
@ApiOperation(value = "添加积分商品--供应商")
@PostMapping(value = "/add")
+ @Log(title = "积分商品管理-添加积分商品", businessType = BusinessType.INSERT)
public R<String> add(@RequestBody TSysGoods goods) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -145,6 +148,7 @@
@ApiOperation(value = "编辑积分商品--供应商")
@PostMapping(value = "/update")
+ @Log(title = "积分商品管理-编辑积分商品", businessType = BusinessType.UPDATE)
public R<String> update(@RequestBody TSysGoods goods) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -174,6 +178,7 @@
@ApiOperation(value = "删除积分商品--供应商")
@DeleteMapping(value = "/delete/{id}")
+ @Log(title = "积分商品管理-删除积分商品", businessType = BusinessType.DELETE)
public R<String> delete(@PathVariable String id) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -200,6 +205,7 @@
@ApiOperation(value = "积分商品 上下架--供应商")
@PostMapping(value = "/updateStatus")
+ @Log(title = "积分商品管理-上下架积分商品", businessType = BusinessType.UPDATE)
public R<String> updateStatus(@RequestBody @Valid TErpGoodsUpdateStatusDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -251,6 +257,7 @@
// 获取兑换记录
@ApiOperation(value = "发货--供应商")
@PostMapping(value = "/sendGoods")
+ @Log(title = "积分商品管理-发货", businessType = BusinessType.UPDATE)
public R<?> sendGoods(@RequestBody @Valid TSysGoodsExchange exchange) {
TSysGoodsExchange exchange1 = sysGoodsExchangeService.getById(exchange.getId());
if (exchange1.getStatus() == 2) {
@@ -328,6 +335,7 @@
*/
@ApiOperation(value = "兑换商品--诊所")
@PostMapping(value = "/exchangeGoods")
+ @Log(title = "积分商品管理-诊所兑换商品", businessType = BusinessType.INSERT)
public R<?> exchangeGoods(@RequestBody @Valid ExchangeGoodsDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
--
Gitblit v1.7.1