1

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

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.CommonUtils;
+import org.jeecg.modules.business.entity.BusAgreementOrderFee;
 import org.jeecg.modules.business.entity.BusHotel;
 import org.jeecg.modules.business.service.impl.BusHotelServiceImpl;
 import org.jeecg.modules.kc.entity.KcDepositoryInGoods;
@@ -32,11 +33,9 @@ import org.jeecg.modules.rooms.mapper.CesGoodsMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -140,7 +139,19 @@ private KcGoodsServiceImpl kcGoodsService;
         }
         if (!StringUtils.isBlank(dto.getTypeId())) {
             String typeId = CommonUtils.escapeChar(dto.getTypeId());
-            queryWrapper.like(CesGoods.GOOD_TYPE, typeId);
+            QueryWrapper<CesStockType> queryWrapper_CesStockType = new QueryWrapper<CesStockType>();
+            queryWrapper_CesStockType.eq("parent_id",typeId);
+            List<CesStockType> typeList = stockTypeService.list(queryWrapper_CesStockType);
+            if (typeList != null && typeList.size() > 0){
+                String types = "";
+                for (CesStockType item : typeList){
+                    types = types+item.getId()+",";
+                }
+                queryWrapper.in(CesGoods.GOOD_TYPE, Arrays.asList(types.split(",")));
+            }else{
+                queryWrapper.like(CesGoods.GOOD_TYPE, typeId);
+            }
+
         }
         queryWrapper.eq(CesGoods.HOTEL_ID, dto.getHotelId());
         queryWrapper.eq(CesGoods.INVALID, false);