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/rooms/DTO/CesGoodsSearchDto.java

@@ -8,4 +8,5 @@ public class CesGoodsSearchDto  extends BasePage {
     private String search;
 
     private String hotelId;
+    private String typeId;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/Vo/CesGoodsVo.java

@@ -12,4 +12,6 @@ public class CesGoodsVo extends CesGoods {
     private String unitName;
 
     private String stockGoodsName;
+
+    private Double number;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesGoodsController.java

@@ -75,6 +75,24 @@ public class CesGoodsController extends JeecgController<CesGoods,CesGoodsService
         }
     }
 
+    /***
+     * 查询
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value="查询", notes="查询")
+    @GetMapping(value = "/queryList")
+    public Result queryList(CesGoodsSearchDto dto){
+        if(StringUtils.isBlank(dto.getHotelId())){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try{
+            return goodsService.queryList(dto);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
 
     @ApiOperation(value="创建", notes="创建")
     @PostMapping(value = "/create")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesStockTypeController.java

@@ -61,6 +61,18 @@ public class CesStockTypeController {
             return Result.error(e.getMessage());
         }
     }
+    @ApiOperation(value="下级分类查询", notes="下级分类查询")
+    @GetMapping(value = "/getChildTypes")
+    public Result getChildTypes(@RequestParam String hotelId,@RequestParam String parentId){
+        if(StringUtils.isBlank(hotelId)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try{
+            return stockTypeService.getChildTypes(hotelId,parentId);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
 
     /**
      * 根据posType获取对应分类

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesGoodsServiceImpl.java

@@ -126,6 +126,63 @@ private KcGoodsServiceImpl kcGoodsService;
         return Result.OK(map);
     }
 
+    /**
+     * 查询商品列表
+     * @param dto
+     * @return
+     */
+    public Result queryList(CesGoodsSearchDto dto) {
+        QueryWrapper<CesGoods> queryWrapper = new QueryWrapper<>();
+        if (!StringUtils.isBlank(dto.getSearch())) {
+            String search = CommonUtils.escapeChar(dto.getSearch());
+            queryWrapper.or().like(CesGoods.BAR_CODE, search);
+            queryWrapper.or().like(CesGoods.NAME, search);
+        }
+        if (!StringUtils.isBlank(dto.getTypeId())) {
+            String typeId = CommonUtils.escapeChar(dto.getTypeId());
+            queryWrapper.like(CesGoods.GOOD_TYPE, typeId);
+        }
+        queryWrapper.eq(CesGoods.HOTEL_ID, dto.getHotelId());
+        queryWrapper.eq(CesGoods.INVALID, false);
+        queryWrapper.orderByDesc(CesGoods.CREATAT);
+
+        List<CesGoods> result = goodsMapper.selectList(queryWrapper);
+        List<String> hotelIds = result.stream().map(v -> v.getHotelId()).collect(Collectors.toList());
+        List<BusHotel> hotels = busHotelService.findHotelsByIds(hotelIds);
+        List<String> typeIds = result.stream().map(v -> v.getGoodType()).collect(Collectors.toList());
+        List<CesStockType> typeList = stockTypeService.fetchByIds(typeIds);
+        List<String> unitIds = result.stream().map(v -> v.getGoodUnit()).collect(Collectors.toList());
+        List<CesGoodsUnit> unitList = goodsUnitService.fetchByIds(unitIds);
+        List<CesGoodsVo> voList = new ArrayList<>();
+        result.forEach(v -> {
+            CesGoodsVo vo = new CesGoodsVo();
+            BeanUtil.copyProperties(v, vo);
+            Optional<BusHotel> busHotelOptional = hotels.stream().filter(c -> c.getId().equals(v.getHotelId())).findFirst();
+            if (busHotelOptional.isPresent()) {
+                vo.setHotelName(busHotelOptional.get().getName());
+            }
+            Optional<CesStockType> typeOptional = typeList.stream().filter(c -> c.getId().equals(v.getGoodType())).findFirst();
+            if (typeOptional.isPresent()) {
+                vo.setTypeName(typeOptional.get().getName());
+            }
+            Optional<CesGoodsUnit> unitOptional = unitList.stream().filter(c -> c.getId().equals(v.getGoodUnit())).findFirst();
+            if (unitOptional.isPresent()) {
+                vo.setUnitName(unitOptional.get().getName());
+            }
+            if (v.getIsStock() && ObjectUtils.isNotEmpty(v.getDepositoryInGoodsId())) {
+                KcDepositoryInGoods kcDepositoryInGoods = kcDepositoryInGoodsService.getById(v.getDepositoryInGoodsId());
+                if (kcDepositoryInGoods != null) {
+                    KcGoods kcGoods = kcGoodsService.getById(kcDepositoryInGoods.getGoodsId());
+                    if (kcGoods != null) {
+                        vo.setStockGoodsName(kcGoods.getName());
+                    }
+                }
+            }
+            vo.setNumber(Double.valueOf(0));
+            voList.add(vo);
+        });
+        return Result.OK(voList);
+    }
 
     /**
      * 创建商品

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesStockTypeServiceImpl.java

@@ -85,6 +85,19 @@ public class CesStockTypeServiceImpl extends ServiceImpl<CesStockTypeMapper, Ces
                 .eq(CesStockType::getInvalid,false));
         return Result.OK(list);
     }
+    /**
+     * 获取下级分类
+     * @return
+     */
+    public Result getChildTypes(String hotelId,String parentId){
+        //查询数据
+        List<CesStockType> list = stockTypeMapper.selectList(Wrappers.<CesStockType>lambdaQuery()
+                .eq(CesStockType::getHotelId,hotelId)
+                .eq(CesStockType::getState,true)
+                .eq(CesStockType::getParentId,parentId)
+                .eq(CesStockType::getInvalid,false));
+        return Result.OK(list);
+    }
 
     public Result getTopTypes(String hotelId,String posType) {
         LambdaQueryWrapper<CesStockType> lambdaQueryWrapper = new LambdaQueryWrapper<>();