From bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:50:47 +0800
Subject: [PATCH] 生成数据明细导出修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 26 ++++++++++++++++----------
1 files changed, 16 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 8e3a364..d44f85b 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
@@ -49,9 +49,10 @@
public AjaxResult<List<TGoodsType>> 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::getShopId, shopId);
+ wrapper.eq(TGoodsType::getMealType, shop.getMealType());
}
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -61,17 +62,19 @@
*/
@ApiOperation( value = "查询商品分类列表-后台使用")
@GetMapping(value = "/getList")
- public AjaxResult<List<TGoodsType>> getList(@RequestParam("mealType") Integer mealType) {
+ public AjaxResult<List<TGoodsType>> getList(@RequestParam(value = "mealType",required = false) Integer mealType) {
// 获取餐饮分类店铺id
- TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
- .eq(TShop::getMealType, mealType)
- .last("LIMIT 1"));
- if(Objects.isNull(one)){
- String str = mealType == 1 ? "中餐" : "火锅";
- return AjaxResult.error("无"+str+"类型店铺");
- }
+// TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
+// .eq(TShop::getMealType, mealType)
+// .last("LIMIT 1"));
+// if(Objects.isNull(one)){
+// String str = mealType == 1 ? "中餐" : "火锅";
+// return AjaxResult.error("无"+str+"类型店铺");
+// }
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TGoodsType::getShopId, one.getId());
+ if(Objects.nonNull(mealType)){
+ wrapper.eq(TGoodsType::getMealType, mealType);
+ }
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -81,6 +84,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));
}
--
Gitblit v1.7.1