pack sort;

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

@@ -62,16 +62,10 @@ public class SPack extends BaseEntity {
     @Excel(name = "是否首次下单可用：0否，1是")
     private Integer firstOrderAvailable;
 
-    @Override
-    public String toString() {
-        return "SPack{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", duration='" + duration + '\'' +
-                ", price=" + price +
-                ", packaStartPeriod='" + packaStartPeriod + '\'' +
-                ", packaEndPeriod='" + packaEndPeriod + '\'' +
-                ", firstOrderAvailable=" + firstOrderAvailable +
-                '}';
-    }
+    /**
+     * 是否首次下单可用
+     */
+    @Excel(name = "排序")
+    private Integer sort;
+
 }

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

@@ -130,6 +130,7 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, SPack> implements I
         }
         LambdaQueryWrapper<SPack> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.in(SPack::getId, packIds);
+        queryWrapper.orderByAsc(SPack::getSort);
         List<SPack> packList = baseMapper.selectList(queryWrapper);
         SConsumer user = consumerService.getInfo();
         List<SOrder> orderList = new ArrayList<>();

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

@@ -7,6 +7,7 @@ import java.util.List;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import share.common.constant.Constants;
 import share.common.enums.CleaningStatusEnum;
 import share.common.enums.OpTypeEnum;
 import share.common.enums.RoleTypeEnum;
@@ -195,7 +196,7 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
         Date now = DateUtil.date();
         LambdaQueryWrapper<SCleanRecords> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SCleanRecords::getStatus,0);
-        queryWrapper.le(SCleanRecords::getCreateTime, DateUtil.offsetMinute(now, -30));
+        queryWrapper.le(SCleanRecords::getCreateTime, DateUtil.offsetMinute(now, -Constants.ROOM_LOCK_DELAY_MINUTE));
         List<SCleanRecords> list = baseMapper.selectList(queryWrapper);
         if (list.size() == 0) {
             return Boolean.FALSE;