pos设置

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosMealSectionController.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosMealSection;
 import org.jeecg.modules.pos.service.IPosMealSectionService;
@@ -50,7 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosMealSectionController extends JeecgController<PosMealSection, IPosMealSectionService> {
 	@Autowired
 	private IPosMealSectionService posMealSectionService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -72,7 +73,7 @@ public class PosMealSectionController extends JeecgController<PosMealSection, IP
 		IPage<PosMealSection> pageList = posMealSectionService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +85,11 @@ public class PosMealSectionController extends JeecgController<PosMealSection, IP
 	//@RequiresPermissions("pos:pos_meal_section:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosMealSection posMealSection) {
+		posMealSection.setTenantId(TokenUtils.currentTenantId());
 		posMealSectionService.save(posMealSection);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +104,7 @@ public class PosMealSectionController extends JeecgController<PosMealSection, IP
 		posMealSectionService.updateById(posMealSection);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +119,7 @@ public class PosMealSectionController extends JeecgController<PosMealSection, IP
 		posMealSectionService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +134,7 @@ public class PosMealSectionController extends JeecgController<PosMealSection, IP
 		this.posMealSectionService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosRegionController.java

@@ -10,9 +10,14 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosRegion;
+import org.jeecg.modules.pos.entity.PosTableType;
+import org.jeecg.modules.pos.entity.PosType;
 import org.jeecg.modules.pos.service.IPosRegionService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTypeService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +56,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosRegionController extends JeecgController<PosRegion, IPosRegionService> {
 	@Autowired
 	private IPosRegionService posRegionService;
-	
+	 @Autowired
+	 private IPosTypeService posTypeService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +77,15 @@ public class PosRegionController extends JeecgController<PosRegion, IPosRegionSe
 		QueryWrapper<PosRegion> queryWrapper = QueryGenerator.initQueryWrapper(posRegion, req.getParameterMap());
 		Page<PosRegion> page = new Page<PosRegion>(pageNo, pageSize);
 		IPage<PosRegion> pageList = posRegionService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			PosType type = posTypeService.getById(item.getPosTypeId());
+			if (type != null) {
+				item.setTypeName(type.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +97,18 @@ public class PosRegionController extends JeecgController<PosRegion, IPosRegionSe
 	//@RequiresPermissions("pos:pos_region:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosRegion posRegion) {
+		if (posRegion.getTenantId() == null || posRegion.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posRegion.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
 		posRegionService.save(posRegion);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +123,7 @@ public class PosRegionController extends JeecgController<PosRegion, IPosRegionSe
 		posRegionService.updateById(posRegion);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +138,7 @@ public class PosRegionController extends JeecgController<PosRegion, IPosRegionSe
 		posRegionService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +153,7 @@ public class PosRegionController extends JeecgController<PosRegion, IPosRegionSe
 		this.posRegionService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosSellClearGoodsController.java

@@ -9,10 +9,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosSellClearGoods;
+import org.jeecg.modules.pos.entity.PosType;
 import org.jeecg.modules.pos.service.IPosSellClearGoodsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +26,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.rooms.entity.CesGoods;
+import org.jeecg.modules.rooms.service.CesGoodsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,29 +58,35 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosSellClearGoodsController extends JeecgController<PosSellClearGoods, IPosSellClearGoodsService> {
 	@Autowired
 	private IPosSellClearGoodsService posSellClearGoodsService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param posSellClearGoods
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "pos_sell_clear_goods-分页列表查询")
-	@ApiOperation(value="pos_sell_clear_goods-分页列表查询", notes="pos_sell_clear_goods-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<PosSellClearGoods>> queryPageList(PosSellClearGoods posSellClearGoods,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<PosSellClearGoods> queryWrapper = QueryGenerator.initQueryWrapper(posSellClearGoods, req.getParameterMap());
-		Page<PosSellClearGoods> page = new Page<PosSellClearGoods>(pageNo, pageSize);
-		IPage<PosSellClearGoods> pageList = posSellClearGoodsService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
+	@Autowired
+	private CesGoodsServiceImpl cesGoodsService;
+
+	 /**
+	  * 商品沽清列表
+	  * @param cesGoods
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @ApiOperation(value="pos_sell_clear_goods-分页列表查询", notes="pos_sell_clear_goods-分页列表查询")
+	 @GetMapping(value = "/list")
+	 public Result<IPage<CesGoods>> queryPageList(CesGoods cesGoods,
+														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   HttpServletRequest req) {
+		 QueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap());
+		 Page<CesGoods> page = new Page<CesGoods>(pageNo, pageSize);
+		 IPage<CesGoods> pageList = cesGoodsService.page(page, queryWrapper);
+		 pageList.getRecords().forEach(item -> {
+			 LambdaQueryWrapper<PosSellClearGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 lambdaQueryWrapper.eq(PosSellClearGoods::getGoodsId, item.getId());
+			 Long count = posSellClearGoodsService.count(lambdaQueryWrapper);
+			 item.setIsSellClear(count > 0);
+		 });
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +98,18 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 	//@RequiresPermissions("pos:pos_sell_clear_goods:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosSellClearGoods posSellClearGoods) {
+		if (posSellClearGoods.getTenantId() == null || posSellClearGoods.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posSellClearGoods.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
 		posSellClearGoodsService.save(posSellClearGoods);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,22 +124,23 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 		posSellClearGoodsService.updateById(posSellClearGoods);
 		return Result.OK("编辑成功!");
 	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "pos_sell_clear_goods-通过id删除")
-	@ApiOperation(value="pos_sell_clear_goods-通过id删除", notes="pos_sell_clear_goods-通过id删除")
-	//@RequiresPermissions("pos:pos_sell_clear_goods:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		posSellClearGoodsService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
+	 /**
+	  *   通过goodsId删除
+	  *
+	  * @param goodsId
+	  * @return
+	  */
+	 @AutoLog(value = "pos_sell_clear_goods-通过id删除")
+	 @ApiOperation(value="pos_sell_clear_goods-通过id删除", notes="pos_sell_clear_goods-通过id删除")
+	 //@RequiresPermissions("pos:pos_sell_clear_goods:delete")
+	 @DeleteMapping(value = "/delete")
+	 public Result<String> delete(@RequestParam(name="goodsId",required=true) String goodsId) {
+		 LambdaQueryWrapper<PosSellClearGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		 lambdaQueryWrapper.eq(PosSellClearGoods::getGoodsId, goodsId);
+		 posSellClearGoodsService.remove(lambdaQueryWrapper);
+		 return Result.OK("删除成功!");
+	 }
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +155,7 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 		this.posSellClearGoodsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableController.java

@@ -10,9 +10,18 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.pos.entity.PosRegion;
 import org.jeecg.modules.pos.entity.PosTable;
+import org.jeecg.modules.pos.entity.PosTableType;
+import org.jeecg.modules.pos.entity.PosType;
+import org.jeecg.modules.pos.service.IPosRegionService;
 import org.jeecg.modules.pos.service.IPosTableService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +29,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTableTypeService;
+import org.jeecg.modules.pos.service.IPosTypeService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +61,12 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosTableController extends JeecgController<PosTable, IPosTableService> {
 	@Autowired
 	private IPosTableService posTableService;
-	
+	 @Autowired
+	 private IPosTypeService posTypeService;
+	 @Autowired
+	 private IPosRegionService posRegionService;
+	 @Autowired
+	 private IPosTableTypeService posTableTypeService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +86,23 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		QueryWrapper<PosTable> queryWrapper = QueryGenerator.initQueryWrapper(posTable, req.getParameterMap());
 		Page<PosTable> page = new Page<PosTable>(pageNo, pageSize);
 		IPage<PosTable> pageList = posTableService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			PosType type = posTypeService.getById(item.getPosTypeId());
+			if (type != null) {
+				item.setTypeName(type.getName());
+			}
+			PosRegion region = posRegionService.getById(item.getPosRegionId());
+			if (region != null) {
+				item.setRegionName(region.getName());
+			}
+			PosTableType tableType = posTableTypeService.getById(item.getPosTableTypeId());
+			if (tableType != null) {
+				item.setTableTypeName(tableType.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +114,18 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 	//@RequiresPermissions("pos:pos_table:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosTable posTable) {
+		if (posTable.getTenantId() == null || posTable.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posTable.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
 		posTableService.save(posTable);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +140,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		posTableService.updateById(posTable);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +155,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		posTableService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +170,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		this.posTableService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableTypeController.java

@@ -10,9 +10,13 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosTableType;
+import org.jeecg.modules.pos.entity.PosType;
 import org.jeecg.modules.pos.service.IPosTableTypeService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTypeService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +55,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosTableTypeController extends JeecgController<PosTableType, IPosTableTypeService> {
 	@Autowired
 	private IPosTableTypeService posTableTypeService;
-	
+	 @Autowired
+	 private IPosTypeService posTypeService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +76,15 @@ public class PosTableTypeController extends JeecgController<PosTableType, IPosTa
 		QueryWrapper<PosTableType> queryWrapper = QueryGenerator.initQueryWrapper(posTableType, req.getParameterMap());
 		Page<PosTableType> page = new Page<PosTableType>(pageNo, pageSize);
 		IPage<PosTableType> pageList = posTableTypeService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			PosType type = posTypeService.getById(item.getPosTypeId());
+			if (type != null) {
+				item.setTypeName(type.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +96,18 @@ public class PosTableTypeController extends JeecgController<PosTableType, IPosTa
 	//@RequiresPermissions("pos:pos_table_type:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosTableType posTableType) {
+		if (posTableType.getTenantId() == null || posTableType.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posTableType.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
 		posTableTypeService.save(posTableType);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +122,7 @@ public class PosTableTypeController extends JeecgController<PosTableType, IPosTa
 		posTableTypeService.updateById(posTableType);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +137,7 @@ public class PosTableTypeController extends JeecgController<PosTableType, IPosTa
 		posTableTypeService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +152,7 @@ public class PosTableTypeController extends JeecgController<PosTableType, IPosTa
 		this.posTableTypeService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableTypeInGoodsController.java

@@ -1,18 +1,25 @@
 package org.jeecg.modules.pos.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusCancel;
+import org.jeecg.modules.pos.entity.PosTableType;
 import org.jeecg.modules.pos.entity.PosTableTypeInGoods;
+import org.jeecg.modules.pos.entity.PosType;
 import org.jeecg.modules.pos.service.IPosTableTypeInGoodsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +27,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTableTypeService;
+import org.jeecg.modules.rooms.entity.CesGoods;
+import org.jeecg.modules.rooms.service.CesGoodsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +60,10 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeInGoods, IPosTableTypeInGoodsService> {
 	@Autowired
 	private IPosTableTypeInGoodsService posTableTypeInGoodsService;
-	
+	@Autowired
+	private CesGoodsServiceImpl cesGoodsService;
+	 @Autowired
+	 private IPosTableTypeService posTableTypeService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +83,20 @@ public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeI
 		QueryWrapper<PosTableTypeInGoods> queryWrapper = QueryGenerator.initQueryWrapper(posTableTypeInGoods, req.getParameterMap());
 		Page<PosTableTypeInGoods> page = new Page<PosTableTypeInGoods>(pageNo, pageSize);
 		IPage<PosTableTypeInGoods> pageList = posTableTypeInGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesGoods goods = cesGoodsService.getById(item.getGoodsId());
+			if (goods != null) {
+				item.setGoodsName(goods.getName());
+				item.setPrice(goods.getSellingPrice());
+			}
+			PosTableType tableType = posTableTypeService.getById(item.getPosTableTypeId());
+			if (tableType != null) {
+				item.setTableTypeName(tableType.getName());
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,11 +108,52 @@ public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeI
 	//@RequiresPermissions("pos:pos_table_type_in_goods:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosTableTypeInGoods posTableTypeInGoods) {
+		if (posTableTypeInGoods.getTenantId() == null || posTableTypeInGoods.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posTableTypeInGoods.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
 		posTableTypeInGoodsService.save(posTableTypeInGoods);
 		return Result.OK("添加成功！");
 	}
-	
-	/**
+
+	 /**
+	  * 批量添加
+	  * @param posTableTypeInGoodsList
+	  * @return
+	  */
+	 @AutoLog(value = "pos_table_type_in_goods-批量添加")
+	 @ApiOperation(value="pos_table_type_in_goods-批量添加", notes="pos_table_type_in_goods-批量添加")
+	 @PostMapping(value = "/addBatch")
+	 public Result<String> addBatch(@RequestBody List<PosTableTypeInGoods> posTableTypeInGoodsList) {
+		 String tenantId = "";
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			 tenantId = user.getRelTenantIds();
+		 } else {
+			 throw new JeecgBootException("当前登录人租户信息错误");
+		 }
+		 List<PosTableTypeInGoods> list = new ArrayList<PosTableTypeInGoods>();
+		 for (PosTableTypeInGoods posTableTypeInGoods : posTableTypeInGoodsList) {
+			 posTableTypeInGoods.setTenantId(tenantId);
+			 LambdaQueryWrapper<PosTableTypeInGoods> queryWrapper = new LambdaQueryWrapper<PosTableTypeInGoods>();
+			 queryWrapper.eq(PosTableTypeInGoods::getHotelId, posTableTypeInGoods.getHotelId());
+			 queryWrapper.eq(PosTableTypeInGoods::getGoodsId, posTableTypeInGoods.getGoodsId());
+			 queryWrapper.eq(PosTableTypeInGoods::getPosTableTypeId, posTableTypeInGoods.getPosTableTypeId());
+			 Long count = this.posTableTypeInGoodsService.count(queryWrapper);
+			 if (count <= 0) {
+				 list.add(posTableTypeInGoods);
+			 }
+		 }
+		 this.posTableTypeInGoodsService.saveBatch(list);
+		 return Result.OK("添加成功!");
+	 }
+
+
+	 /**
 	 *  编辑
 	 *
 	 * @param posTableTypeInGoods
@@ -102,7 +167,7 @@ public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeI
 		posTableTypeInGoodsService.updateById(posTableTypeInGoods);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +182,7 @@ public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeI
 		posTableTypeInGoodsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +197,7 @@ public class PosTableTypeInGoodsController extends JeecgController<PosTableTypeI
 		this.posTableTypeInGoodsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosThaliController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.pos.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -9,10 +10,19 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosThali;
+import org.jeecg.modules.pos.entity.PosThaliInGoods;
+import org.jeecg.modules.pos.service.IPosThaliInGoodsService;
 import org.jeecg.modules.pos.service.IPosThaliService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,7 +60,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosThaliController extends JeecgController<PosThali, IPosThaliService> {
 	@Autowired
 	private IPosThaliService posThaliService;
-	
+	@Autowired
+	private IPosThaliInGoodsService posThaliInGoodsService;
 	/**
 	 * 分页列表查询
 	 *
@@ -72,7 +83,7 @@ public class PosThaliController extends JeecgController<PosThali, IPosThaliServi
 		IPage<PosThali> pageList = posThaliService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -84,10 +95,31 @@ public class PosThaliController extends JeecgController<PosThali, IPosThaliServi
 	//@RequiresPermissions("pos:pos_thali:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody PosThali posThali) {
-		posThaliService.save(posThali);
+		if (posThali.getTenantId() == null || posThali.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				posThali.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		posThali.setId(UUIDGenerator.generate());
+		boolean res = posThaliService.save(posThali);
+		if (res) {
+			if (ObjectUtils.isNotEmpty(posThali.getPosThaliInGoodsList())) {
+				posThali.getPosThaliInGoodsList().forEach(t -> {
+					t.setGoodsId(t.getId());
+					t.setId("");
+					t.setHotelId(posThali.getHotelId());
+					t.setPosThaliId(posThali.getId());
+					t.setTenantId(TokenUtils.currentTenantId());
+				});
+				posThaliInGoodsService.saveBatch(posThali.getPosThaliInGoodsList());
+			}
+		}
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -99,10 +131,25 @@ public class PosThaliController extends JeecgController<PosThali, IPosThaliServi
 	//@RequiresPermissions("pos:pos_thali:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PosThali posThali) {
-		posThaliService.updateById(posThali);
+		Boolean res = posThaliService.updateById(posThali);
+		if (res) {
+			LambdaQueryWrapper<PosThaliInGoods> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(PosThaliInGoods::getPosThaliId,posThali.getId());
+			posThaliInGoodsService.remove(lambdaQueryWrapper);
+			if (ObjectUtils.isNotEmpty(posThali.getPosThaliInGoodsList())) {
+				posThali.getPosThaliInGoodsList().forEach(t -> {
+					t.setGoodsId(t.getId());
+					t.setId("");
+					t.setHotelId(posThali.getHotelId());
+					t.setPosThaliId(posThali.getId());
+					t.setTenantId(TokenUtils.currentTenantId());
+				});
+				posThaliInGoodsService.saveBatch(posThali.getPosThaliInGoodsList());
+			}
+		}
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +164,7 @@ public class PosThaliController extends JeecgController<PosThali, IPosThaliServi
 		posThaliService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +179,7 @@ public class PosThaliController extends JeecgController<PosThali, IPosThaliServi
 		this.posThaliService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosThaliInGoodsController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.pos.entity.PosThaliInGoods;
+import org.jeecg.modules.pos.entity.PosType;
 import org.jeecg.modules.pos.service.IPosThaliInGoodsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.pos.service.IPosTypeService;
+import org.jeecg.modules.rooms.entity.CesGoods;
+import org.jeecg.modules.rooms.service.CesGoodsServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +54,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods, IPosThaliInGoodsService> {
 	@Autowired
 	private IPosThaliInGoodsService posThaliInGoodsService;
-	
+	 @Autowired
+	 private CesGoodsServiceImpl cesGoodsService;
 	/**
 	 * 分页列表查询
 	 *
@@ -70,9 +75,19 @@ public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods,
 		QueryWrapper<PosThaliInGoods> queryWrapper = QueryGenerator.initQueryWrapper(posThaliInGoods, req.getParameterMap());
 		Page<PosThaliInGoods> page = new Page<PosThaliInGoods>(pageNo, pageSize);
 		IPage<PosThaliInGoods> pageList = posThaliInGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesGoods goods = cesGoodsService.getById(item.getGoodsId());
+			if (goods != null) {
+				item.setName(goods.getName());
+				item.setBarCode(goods.getBarCode());
+				item.setInventory(goods.getInventory());
+				item.setSellingPrice(goods.getSellingPrice());
+				item.setId(goods.getId());
+			}
+		});
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -87,7 +102,7 @@ public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods,
 		posThaliInGoodsService.save(posThaliInGoods);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -102,7 +117,7 @@ public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods,
 		posThaliInGoodsService.updateById(posThaliInGoods);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -117,7 +132,7 @@ public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods,
 		posThaliInGoodsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -132,7 +147,7 @@ public class PosThaliInGoodsController extends JeecgController<PosThaliInGoods,
 		this.posThaliInGoodsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosRegion.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -52,4 +50,8 @@ public class PosRegion implements Serializable {
 	@Excel(name = "pos类型id", width = 15)
     @ApiModelProperty(value = "pos类型id")
     private java.lang.String posTypeId;
+
+
+    @TableField(exist = false)
+    private  String typeName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosTable.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -72,4 +70,14 @@ public class PosTable implements Serializable {
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.Integer state;
+
+	@TableField(exist = false)
+	private  String typeName;
+
+    @TableField(exist = false)
+    private  String regionName;
+
+    @TableField(exist = false)
+    private  String tableTypeName;
+
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosTableType.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -52,4 +50,7 @@ public class PosTableType implements Serializable {
 	@Excel(name = "pos类型id", width = 15)
     @ApiModelProperty(value = "pos类型id")
     private java.lang.String posTypeId;
+
+    @TableField(exist = false)
+    private  String typeName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosTableTypeInGoods.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -56,4 +54,12 @@ public class PosTableTypeInGoods implements Serializable {
 	@Excel(name = "数量", width = 15)
     @ApiModelProperty(value = "数量")
     private java.lang.Integer num;
+
+    @TableField(exist = false)
+    private  String goodsName;
+
+    @TableField(exist = false)
+    private  BigDecimal price;
+    @TableField(exist = false)
+    private  String tableTypeName;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosThali.java

@@ -4,10 +4,9 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -48,10 +47,6 @@ public class PosThali implements Serializable {
 	@Excel(name = "套餐名称", width = 15)
     @ApiModelProperty(value = "套餐名称")
     private java.lang.String name;
-	/**pos类型id*/
-	@Excel(name = "pos类型id", width = 15)
-    @ApiModelProperty(value = "pos类型id")
-    private java.lang.String posTypeId;
 	/**套餐条形码*/
 	@Excel(name = "套餐条形码", width = 15)
     @ApiModelProperty(value = "套餐条形码")
@@ -67,13 +62,16 @@ public class PosThali implements Serializable {
 	/**状态*/
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
-    private java.lang.Integer state;
+    private Boolean state;
 	/**是否厨打*/
 	@Excel(name = "是否厨打", width = 15)
     @ApiModelProperty(value = "是否厨打")
-    private java.lang.Integer kitchen;
+    private Boolean kitchen;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+
+	@TableField(exist = false)
+	private List<PosThaliInGoods> posThaliInGoodsList;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosThaliInGoods.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -59,5 +57,15 @@ public class PosThaliInGoods implements Serializable {
 	/**必选项*/
 	@Excel(name = "必选项", width = 15)
     @ApiModelProperty(value = "必选项")
-    private java.lang.Integer required;
+    private Boolean required;
+
+	@TableField(exist = false)
+	private String name;
+
+    @TableField(exist = false)
+    private String barCode;
+    @TableField(exist = false)
+    private Integer inventory;
+    @TableField(exist = false)
+    private BigDecimal sellingPrice;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesGoods.java

@@ -213,4 +213,6 @@ public class CesGoods extends Model<CesGoods> {
         return this.id;
     }
 
+    @TableField(exist = false)
+    private  Boolean isSellClear;
 }