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 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 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 impleme @Override public PageResult pageRel(MpMenuParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, menu_id asc"); + page.setDefaultOrder("rows asc, sort_number asc, menu_id asc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class MpMenuServiceImpl extends ServiceImpl impleme List list = baseMapper.selectListRel(param); // 排序 PageParam 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); }