Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusHotelController.java

@@ -277,6 +277,9 @@ public class BusHotelController extends JeecgController<BusHotel, IBusHotelServi
 		 editHotel.setSfzName(busHotel.getSfzName());
 		 editHotel.setIdCard(busHotel.getIdCard());
 
+		 editHotel.setEwmLogo(busHotel.getEwmLogo());
+		 editHotel.setImgs(busHotel.getImgs());
+
 		 editHotel.setUpdateBy(JwtUtil.getUserNameByToken(request));
 		 editHotel.setUpdateTime(new Date());
 		 busHotelService.editHotelInfo(editHotel);

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

@@ -90,8 +90,8 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 												  @RequestParam(name="goodTypes[]",required = false) List<String> goodTypes,
 														   HttpServletRequest req) {
 		 LambdaQueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap()).lambda();
-		 queryWrapper.eq(CesGoods::getInvalid,false);
-		 queryWrapper.eq(CesGoods::getIsTemp,false);
+		 queryWrapper.eq(CesGoods::getInvalid, false);
+		 queryWrapper.eq(CesGoods::getIsTemp, false);
 		 if (ObjectUtils.isNotEmpty(goodTypes)) {
 			 List<CesStockType> list = cesStockTypeService.list(Wrappers.<CesStockType>lambdaQuery()
 					 .eq(CesStockType::getHotelId, cesGoods.getHotelId())
@@ -112,10 +112,15 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 		 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);
+			 if (item.getInventory() <= 0) {
+				 item.setIsSellClear(true);
+			 } else {
+				 LambdaQueryWrapper<PosSellClearGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				 lambdaQueryWrapper.eq(PosSellClearGoods::getGoodsId, item.getId());
+				 Long count = posSellClearGoodsService.count(lambdaQueryWrapper);
+
+				 item.setIsSellClear(count > 0);
+			 }
 		 });
 		 return Result.OK(pageList);
 	 }