From 11a5e71b3e664cc96e292150dbf6beeba40b4282 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 16:55:34 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 22 +++++++++++++---------
ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml | 3 ++-
ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java | 4 ++++
3 files changed, 19 insertions(+), 10 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 b5e28f5..e19d6fe 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
@@ -47,13 +47,14 @@
@ApiOperation( value = "查询商品分类列表")
@PostMapping(value = "/list")
public AjaxResult<List<TGoodsType>> list() {
-// Long shopId = tokenService.getLoginUser().getObjectId();
-// Integer roleType = tokenService.getLoginUser().getRoleType();
-// LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
-// if(roleType != 1){
-// wrapper.eq(TGoodsType::getShopId, shopId);
-// }
- return AjaxResult.success(goodsTypeService.list());
+ Long shopId = tokenService.getLoginUser().getObjectId();
+ Integer roleType = tokenService.getLoginUser().getRoleType();
+ TShop shop = shopService.getById(shopId);
+ LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
+ if(roleType != 1){
+ wrapper.eq(TGoodsType::getMealType, shop.getMealType());
+ }
+ return AjaxResult.success(goodsTypeService.list(wrapper));
}
/**
@@ -70,8 +71,8 @@
// String str = mealType == 1 ? "中餐" : "火锅";
// return AjaxResult.error("无"+str+"类型店铺");
// }
-// LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
-// wrapper.eq(TGoodsType::getShopId, one.getId());
+ LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TGoodsType::getMealType, mealType);
return AjaxResult.success(goodsTypeService.list());
}
@@ -81,6 +82,9 @@
@ApiOperation( value = "添加商品分类")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TGoodsType dto) {
+ Long shopId = tokenService.getLoginUser().getObjectId();
+ TShop shop = shopService.getById(shopId);
+ dto.setMealType(shop.getMealType());
dto.setShopId(tokenService.getLoginUser().getObjectId());
return AjaxResult.success(goodsTypeService.save(dto));
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java
index e8c0975..e274c72 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java
@@ -37,4 +37,8 @@
@TableField("typeName")
private String typeName;
+ @ApiModelProperty(value = "餐饮分类 1=中餐 2=火锅")
+ @TableField("mealType")
+ private Integer mealType;
+
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml
index dcad072..97f2eeb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml
@@ -12,11 +12,12 @@
<result column="createBy" property="createBy" />
<result column="updateBy" property="updateBy" />
<result column="shopId" property="shopId" />
+ <result column="mealType" property="mealType" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, typeName, createTime, updateTime, disabled, createBy, updateBy,shopId
+ id, typeName, createTime, updateTime, disabled, createBy, updateBy,shopId,mealType
</sql>
<delete id="deleteByShopId">
delete from t_goods_type where shopId = #{shopId}
--
Gitblit v1.7.1