From 4c36609d693cba9fe34dfd293972ccefa367cabf Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 3 Jun 2024 10:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B8=B8=E6=B3=B3?=
 =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E5=8F=AF=E9=87=8D=E5=A4=8D=E9=A2=84=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/booking/controller/PeriodController.java | 7 +++++--
 .../com/gxwebsoft/cms/service/impl/MpMenuServiceImpl.java  | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/booking/controller/PeriodController.java b/src/main/java/com/gxwebsoft/booking/controller/PeriodController.java
index 4196300..31500b7 100644
--- a/src/main/java/com/gxwebsoft/booking/controller/PeriodController.java
+++ b/src/main/java/com/gxwebsoft/booking/controller/PeriodController.java
@@ -127,13 +127,16 @@ public class PeriodController extends BaseController {
           // 字符串转集合（从redis取数据并转为List）
           final List<Field> fieldList = JSONObject.parseArray(string, Field.class);
           fieldList.forEach(f -> {
+            System.out.println("是否可重复预定= " + f);
             final String key = getKey(param.getDateTime().concat(d.getTimePeriod().concat(d.getMerchantId().toString()).concat(f.getFieldId().toString())));
             final List<OrderInfo> orderInfos = collectKey.get(key);
-            System.out.println("orderInfos = " + orderInfos);
             if (!CollectionUtils.isEmpty(orderInfos)) {
               final OrderInfo orderInfo = orderInfos.get(0);
               if (orderInfo.getOrderCode().equals(key)) {
-                f.setSold(true);
+                System.out.println("f.getNum = " + f.getNum());
+                if(f.getIsRepeat().equals(0)){
+                  f.setSold(true);
+                }
                 f.setOrderInfoList(orderInfos);
                 f.setOrderId(orderInfo.getOrderId());
               }
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/MpMenuServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/MpMenuServiceImpl.java
index 914360f..e8e0f82 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/MpMenuServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/MpMenuServiceImpl.java
@@ -23,7 +23,7 @@ public class MpMenuServiceImpl extends ServiceImpl<MpMenuMapper, MpMenu> impleme
     @Override
     public PageResult<MpMenu> pageRel(MpMenuParam param) {
         PageParam<MpMenu, MpMenuParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, menu_id asc");
+        page.setDefaultOrder("rows asc, sort_number asc, menu_id asc");
         List<MpMenu> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class MpMenuServiceImpl extends ServiceImpl<MpMenuMapper, MpMenu> impleme
         List<MpMenu> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<MpMenu, MpMenuParam> page = new PageParam<>();
-        page.setDefaultOrder("sort_number asc, menu_id asc");
+        page.setDefaultOrder("rows asc, sort_number asc, menu_id asc");
         return page.sortRecords(list);
     }