调整桌子列表的接口返回

dinner-core/src/main/java/com/fdage/base/dto/DeskListRspDto.java

@@ -5,6 +5,7 @@ import com.fdage.base.entity.TmOrder;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 2 * @Author: Abner
@@ -17,6 +18,6 @@ public class DeskListRspDto implements Serializable {
 
     private TmDesk tmDesk;
 
-    private TmOrder tmOrder;
+    private List<TmOrder> orderList;
 
 }

dinner-core/src/main/java/com/fdage/base/service/impl/TmOrderServiceImpl.java

@@ -106,7 +106,7 @@ public class TmOrderServiceImpl extends ServiceImpl<TmOrderDao, TmOrder> impleme
         return getBaseMapper().selectList(lambdaQueryWrapper);
     }
 
-    public TmOrder getCurDateLatestByDesk(String deskId){
+    public List<TmOrder> getCurDateLatestByDesk(String deskId){
         if(StringUtils.isBlank(deskId)){
             return null;
         }
@@ -114,10 +114,9 @@ public class TmOrderServiceImpl extends ServiceImpl<TmOrderDao, TmOrder> impleme
         lambdaQueryWrapper.eq(TmOrder::getDeskId , deskId);
         lambdaQueryWrapper.eq(TmOrder::getIsDelete , 0);
         lambdaQueryWrapper.eq(TmOrder::getStatus , OrderStatusEnum.ORDER_SUCCESS.getStatus());
-        lambdaQueryWrapper.eq(TmOrder::getReserveDate , LocalDate.now());
+        lambdaQueryWrapper.between(TmOrder::getReserveDate , LocalDate.now(), LocalDate.now().plusDays(4));
         lambdaQueryWrapper.orderByDesc(TmOrder::getCreateTime);
-        lambdaQueryWrapper.last("limit 1");
-        return getBaseMapper().selectOne(lambdaQueryWrapper);
+        return getBaseMapper().selectList(lambdaQueryWrapper);
     }
 
     public TmOrder addNew(TmOrder tmOrder){

dinner-core/src/main/java/com/fdage/controller/app/AppDeskController.java

@@ -66,9 +66,9 @@ public class AppDeskController {
                  DeskListRspDto deskListRspDto = new DeskListRspDto();
                  deskListRspDto.setTmDesk(desk);
                  if(null != desk){
-                     TmOrder tmOrder = tmOrderService.getCurDateLatestByDesk(desk.getId());
-                     if(null != tmOrder){
-                         deskListRspDto.setTmOrder(tmOrder);
+                     List<TmOrder> tmOrderList = tmOrderService.getCurDateLatestByDesk(desk.getId());
+                     if(!CollectionUtils.isEmpty(tmOrderList)){
+                         deskListRspDto.setOrderList(tmOrderList);
                      }
                  }
                  totalDestList.add(deskListRspDto);

dinner-core/src/main/java/com/fdage/controller/app/AppOrderController.java

@@ -210,9 +210,7 @@ public class AppOrderController extends BaseController {
         //2、第二道互斥，通过分布式锁卡位
         //分布式锁，这里不需要释放，没有释放别人的锁的问题存在,这里的锁，只做卡位用，不做库存变更使用
         String redisLockKey = orderAppReqDto.getDeskId() + ":" + orderAppReqDto.getReserveDate();
-        log.info("redis的key={}" , redisLockKey);
         boolean lockFlag = redisTemplate.opsForValue().setIfAbsent(redisLockKey , getContextUserInfo().getId() , 30 , TimeUnit.SECONDS);
-        log.info("抢锁结果:{}" , lockFlag);
         if(!lockFlag){
             log.info("抢锁失败，无法创建订单[{}]" , JSON.toJSONString(orderAppReqDto));
             //抢锁失败