修改退货库存

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

@@ -142,8 +142,14 @@ public class BusOrderFeeController extends JeecgController<BusOrderFee, IBusOrde
 		 // 找出已结算的收款单对应的消费单id
 		 List<String> consumeFeeIds = originalFees.stream().filter(e -> ObjectUtil.equals(e.getPreferentialStatus(), 2))
 				 .map(BusOrderFee::getConsumeFeeId).collect(Collectors.toList());
+		 List<BusOrderFee> allRelevanceFees = new ArrayList<>();
+		 if (!consumeFeeIds.isEmpty()){
+			 // 所有关联的收款单。（一个消费单可能对应多个收款单，退一个收款的，与之同一个消费单的收款单都要退掉）
+			 allRelevanceFees = busOrderFeeService.list(Wrappers.<BusOrderFee>lambdaQuery().in(BusOrderFee::getConsumeFeeId, consumeFeeIds));
+		 }
+
 		 // 找出已结算的收款单id
-		 List<String> collectionFeeIds = originalFees.stream().filter(e -> ObjectUtil.equals(e.getPreferentialStatus(), 2))
+		 List<String> collectionFeeIds = allRelevanceFees.stream().filter(e -> ObjectUtil.equals(e.getPreferentialStatus(), 2))
 				 .map(BusOrderFee::getId).collect(Collectors.toList());
 		 // 将结算的订单改为未结算
 		 consumeFeeIds.addAll(collectionFeeIds);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -1715,7 +1715,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             fee.setDayTime(date);
             // 获取每天超时时间，如果超过预离时间，修改预离时间
             nextCalendar = getNextCalendar(livingOrder, nowCalendar,cesAllDayPriceRule);
-
+            fee.setRemark(DateUtils.formatDate(nowCalendar.getTime(), "MM-dd") + "房费");
         }
         // 移除处理过的时间订单，添加订单下一次超时的时间戳
         redisTemplate.opsForZSet().remove("overTimerOrder",livingOrder.getId());
@@ -3153,7 +3153,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             s.setLivingOrderId(mainRoomOrder.getId());
             s.setHotelId(hotelId);
         });
-        if(settleFees.size() > 0) {
+        if(!settleFees.isEmpty()) {
             // 保存收款单
             feeService.saveBatch(settleFees);
         } else throw new JeecgBootException("参数没有结账收费项目");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusSchemeLayoutDailyPriceServiceImpl.java

@@ -45,7 +45,7 @@ public class BusSchemeLayoutDailyPriceServiceImpl extends ServiceImpl<BusSchemeL
         queryWrapper.eq("scheme_layout_id",schemeLayoutId);
         queryWrapper.eq("del_flag",0);
         List<BusSchemeLayoutDailyPrice> list = list(queryWrapper);
-        //获取从今天开始，两个月时间的数据
+        //获取从今天开始，10天时间的数据
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.rooms.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -223,9 +224,20 @@ public class CesGoodsController extends JeecgController<CesGoods,CesGoodsService
                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                         HttpServletRequest req) {
-        LambdaQueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap()).lambda();
+        LambdaQueryWrapper<CesGoods> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CesGoods::getInvalid, false);
         queryWrapper.eq(CesGoods::getIsTemp, false);
+        queryWrapper.like(StrUtil.isNotEmpty(cesGoods.getName()),CesGoods::getName, cesGoods.getName());
+        queryWrapper.eq(StrUtil.isNotEmpty(cesGoods.getBarCode()),CesGoods::getBarCode, cesGoods.getBarCode());
+        if (StrUtil.isNotEmpty(cesGoods.getGoodType())){
+            List<CesStockType> list = cesStockTypeService.list(Wrappers.<CesStockType>lambdaQuery().eq(CesStockType::getParentId, cesGoods.getGoodType()));
+            queryWrapper.and(e -> {
+                e = e.or().eq(CesGoods::getGoodType, cesGoods.getGoodType());
+                for (CesStockType ele : list) {
+                    e = e.or().eq(CesGoods::getGoodType, ele.getId());
+                }
+            });
+        }
 
         LambdaQueryWrapper<CesStockType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CesStockType::getHotelId, cesGoods.getHotelId());