java/cashier.git

			@@ -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));
			}

			@@ -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}

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/domain/TGoodsType.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TGoodsTypeMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -37,4 +37,8 @@
			@TableField("typeName")
			private String typeName;

			@ApiModelProperty(value = "餐饮分类 1=中餐 2=火锅")
			@TableField("mealType")
			private Integer mealType;

			}