From 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:49:11 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
index 4a859e7..369860c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TGoodsType;
@@ -56,7 +58,11 @@
TShop shop = shopService.getById(shopId);
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
if(roleType != 1){
- wrapper.eq(TGoodsType::getMealType, shop.getMealType());
+ if(roleType == 2){
+ wrapper.eq(TGoodsType::getMealType, shop.getMealType());
+ }else {
+ wrapper.isNull(TGoodsType::getMealType);
+ }
}
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -75,9 +81,6 @@
// String str = mealType == 1 ? "中餐" : "火锅";
// return AjaxResult.error("无"+str+"类型店铺");
// }
- if(Objects.isNull(mealType)){
- mealType = 2;
- }
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
if(Objects.nonNull(mealType)){
wrapper.eq(TGoodsType::getMealType, mealType);
@@ -88,12 +91,13 @@
/**
* 添加商品分类管理
*/
+ @Log(title = "商品分类-添加商品分类", businessType = BusinessType.INSERT)
@ApiOperation( value = "添加商品分类")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TGoodsType dto) {
Long shopId = tokenService.getLoginUser().getObjectId();
TShop shop = shopService.getById(shopId);
- dto.setMealType(Objects.nonNull(shop.getMealType()) ? shop.getMealType() : 1);
+ dto.setMealType(shop.getMealType());
dto.setShopId(shopId);
return AjaxResult.success(goodsTypeService.save(dto));
}
@@ -101,6 +105,7 @@
/**
* 修改商品分类
*/
+ @Log(title = "商品分类-修改商品分类", businessType = BusinessType.UPDATE)
@ApiOperation( value = "修改商品分类")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TGoodsType dto) {
@@ -119,6 +124,7 @@
/**
* 删除商品分类
*/
+ @Log(title = "商品分类-删除商品分类", businessType = BusinessType.DELETE)
@ApiOperation( value = "删除商品分类")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
@@ -134,6 +140,7 @@
/**
* 批量删除商品分类
*/
+ @Log(title = "商品分类-批量删除商品分类", businessType = BusinessType.DELETE)
@ApiOperation( value = "批量删除商品分类")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
--
Gitblit v1.7.1