保洁负责的门店增加保洁状态

share-common/src/main/java/share/common/enums/OrderStatusEnum.java

@@ -5,10 +5,13 @@ package share.common.enums;
  * @Date 2023/10/20 10:57
  */
 public enum OrderStatusEnum {
+    //(0:待使用/已预约，1：使用中，2：已使用，3：已取消预约/申请退款，4：退款中，5：已退费)
     UNUSED(0,"待使用/已预约"),
     INUSE(1,"使用中"),
     USED(2,"已使用"),
-    CANCEL(3,"已取消");
+    CANCEL(3, "已取消"),
+    REFUNDING(4, "退款中"),
+    REFUNDED(5, "已退款");
 
 
     private Integer code;

share-system/src/main/java/share/system/domain/SRoom.java

@@ -95,6 +95,12 @@ public class SRoom extends BaseEntity
     @TableField(exist = false)
     private String openShopUuid;
 
+    /**
+     * 保洁状态
+     */
+    @TableField(exist = false)
+    private Integer recordsStatus;
+
 
 
 }

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -3,6 +3,7 @@ package share.system.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dianping.openapi.sdk.api.customerauth.session.entity.CustomerKeyShopScopeResponseEntity;
 import lombok.var;
@@ -23,10 +24,7 @@ import share.system.domain.*;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.SRoomVo;
 import share.system.domain.vo.SStoreVo;
-import share.system.mapper.RoomPackMapper;
-import share.system.mapper.SRoomMapper;
-import share.system.mapper.SStoreConsumerMapper;
-import share.system.mapper.SStoreMapper;
+import share.system.mapper.*;
 import share.system.request.SStoreRequest;
 import share.system.service.IPackService;
 import share.system.service.ISRoomService;
@@ -53,6 +51,8 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
     private IPackService packService;
     @Autowired
     private QPService qpService;
+    @Autowired
+    private SCleanRecordsMapper sCleanRecordsMapper;
 
     /**
      * 查询门店
@@ -281,7 +281,17 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
         });
         storeList.forEach(item -> {
             item.setRoolList(sRoomService.selectSroomListByStroeId(item.getId()));
+            item.getRoolList().forEach(room -> {
+                LambdaQueryWrapper<SCleanRecords> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(SCleanRecords::getRoomId, room.getId());
+                queryWrapper.eq(SCleanRecords::getStoreId, item.getId());
+                queryWrapper.ne(SCleanRecords::getStatus, 2);
+                SCleanRecords sCleanRecords = sCleanRecordsMapper.selectOne(queryWrapper);
+                room.setRecordsStatus(sCleanRecords.getStatus());
+            });
         });
+
+
         return storeList;
     }