From c3ca4b96db3e6a8afe640d1eae06c69d10481eac Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Sat, 16 Aug 2025 12:54:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?jsk=20=20=E8=A7=A3=E5=86=B3=E5=91=A8?= =?UTF-8?q?=E6=9C=AB=E9=A2=84=E5=AE=9A=E9=A4=90=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=A5=E6=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B=E4=BD=86=E5=91=A8=E4=B8=80=E8=87=B3=E5=91=A8=E4=BA=94?= =?UTF-8?q?=E5=8D=B4=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=9B=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=AF=A6=E6=9F=A5=EF=BC=9B=E7=9B=AE=E5=89=8D=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9C=89=E6=97=A0=E7=A9=BA=E5=80=BC=EF=BC=8C=E6=9C=89?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=B0=B1=E8=AE=BE=E4=B8=BA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AllocStallServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java index fde8d44e..779ad6ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java @@ -62,8 +62,19 @@ public class AllocStallServiceImpl extends ServiceImpl listReserveDate(AllocMobileCanteenQueryDTO queryDTO) { AllocCanteenOrderDTO allocCanteenOrderDTO = this.allocOrderMetadataApi.queryAvailableOrder(queryDTO.getCanteenId(), queryDTO.getStallId()); - String ifReserveSkipHoliday = allocCanteenOrderDTO.getIfReserveSkipHoliday(); - Integer reserveLimitDayNum = Integer.parseInt(allocCanteenOrderDTO.getReserveLimitDay()); + String ifReserveSkipHoliday="1"; + if(allocCanteenOrderDTO.getIfReserveSkipHoliday()!=null&&!"".equals(allocCanteenOrderDTO.getIfReserveSkipHoliday())){ + ifReserveSkipHoliday= allocCanteenOrderDTO.getIfReserveSkipHoliday(); + } + Integer reserveLimitDayNum = 0; + try{ + reserveLimitDayNum=Integer.parseInt(allocCanteenOrderDTO.getReserveLimitDay()); + }catch (Exception e){ + reserveLimitDayNum=7; + } + if(allocCanteenOrderDTO.getIfAllowReserveToday()==null||"".equals(allocCanteenOrderDTO.getIfAllowReserveToday())){ + allocCanteenOrderDTO.setIfAllowReserveToday("1"); + } return this.listMatchData(ifReserveSkipHoliday, reserveLimitDayNum, allocCanteenOrderDTO.getIfAllowReserveToday()); } From 5a67781af53bedf6f5af5aa1d9d1c1934ad97c29 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Sat, 16 Aug 2025 12:58:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?jsk=20=20=E5=90=8C=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/service/impl/AllocStallServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java index 779ad6ef..8902597e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java @@ -65,8 +65,10 @@ public class AllocStallServiceImpl extends ServiceImpl Date: Mon, 18 Aug 2025 11:21:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?jsk=20=20=E6=B7=BB=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E9=A4=90=E6=97=B6=E9=97=B4=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MenuRecipeServiceImpl.java | 30 ++++++++++++++++++ .../menu/vo/AppletReserveRecipeDishesVO.java | 31 +++++++++++++++++++ .../mapper/menu/MenuRecipeMapper.xml | 13 +++++++- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index 349a94bc..c0861d32 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bonus.canteen.core.menu.model.AllocMealtimeModel; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.houqin.constant.DelFlagEnum; import com.bonus.canteen.core.allocation.api.AllocCanteenApi; @@ -37,6 +39,7 @@ import com.bonus.canteen.core.order.api.OrderMenuApi; import com.bonus.canteen.core.order.common.vo.OrderGoodsNumVO; import com.bonus.common.houqin.i18n.I18n; import com.bonus.common.houqin.utils.id.Id; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.slf4j.Logger; @@ -285,6 +288,33 @@ public class MenuRecipeServiceImpl extends ServiceImpl typeList=vo.getTypeList(); + if (ObjectUtil.isNotEmpty(typeList)) { + for(AppletReserveRecipeTypeVO vo1:typeList){ + List dishesList=vo1.getDishesList(); + if (ObjectUtil.isNotEmpty(dishesList)) { + for(AppletReserveRecipeDishesVO vo2:dishesList){ + String mealtime=vo2.getMealTime(); + if(mealtime!=null&&mealtime.contains("\"endTime\":")){ + ObjectMapper mapper = new ObjectMapper(); + AllocMealtimeModel person =new AllocMealtimeModel(); + try{ + person = (AllocMealtimeModel) JSONObject.parseObject(mealtime, AllocMealtimeModel.class); + }catch (Exception e){e.printStackTrace();} + if(person!=null){ + vo2.setStartTime(person.getStartTime()); + } + if(person!=null){ + vo2.setEndTime(person.getEndTime()); + } + + } + } + } + } + } + } resultList.sort(Collections.reverseOrder((s1, s2) -> { return s2.getMealtimeType() - s1.getMealtimeType(); })); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java index 108db2b2..94c213ce 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; +import java.time.LocalTime; import java.util.List; @ApiModel("菜品详情") @@ -45,6 +46,12 @@ public class AppletReserveRecipeDishesVO { private List tasteNameList; @ApiModelProperty("预定时间") private String reserveEndTime; + @ApiModelProperty("当日预定时间") + private String mealTime; + @ApiModelProperty("当日预定结束时间") + private LocalTime endTime; + @ApiModelProperty("当日预定开始时间") + private LocalTime startTime; public String getDishesImgUrl() { return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? SysUtil.getCutFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl; @@ -181,4 +188,28 @@ public class AppletReserveRecipeDishesVO { public void setReserveEndTime(String reserveEndTime) { this.reserveEndTime = reserveEndTime; } + + public String getMealTime() { + return mealTime; + } + + public void setMealTime(String mealTime) { + this.mealTime = mealTime; + } + + public LocalTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalTime endTime) { + this.endTime = endTime; + } + + public LocalTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalTime startTime) { + this.startTime = startTime; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml index 636c98b3..2b1ab2a6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml @@ -147,6 +147,7 @@ + @@ -193,7 +194,7 @@ md.size_json, mdtt.taste_name, mdsr.monthly_sales, - mdsr.good_probability,amd.model_value as reserveEndTime + mdsr.good_probability,amd.model_value as reserveEndTime,amd2.model_value as mealTime from menu_recipe_detail mrd inner join menu_recipe_dishes m on mrd.detail_id = m.detail_id @@ -211,6 +212,16 @@ left join menu_taste_dishes mtd on md.dishes_id = mtd.dishes_id left join menu_dishes_taste mdtt on mtd.taste_id = mdtt.taste_id left join alloc_metadata amd on mr.canteen_id = amd.canteen_id and mr.stall_id = amd.stall_id and amd.model_key='reserveEndTime' + left join ( + select a.*,case when a.model_key='mealtimeBreakfast' then '1' + when a.model_key='mealtimeLunch' then '2' + when a.model_key='mealtimeAfternoonTea' then '3' + when a.model_key='mealtimeDinner' then '4' + when a.model_key='mealtimeMidnightSnack' then '5' + else '0' end as model_keyd + from alloc_metadata a where a.model_type='mealtime' + ) amd2 + on mrd.mealtime_type=amd2.model_keyd and mr.canteen_id = amd2.canteen_id and mr.stall_id = amd2.stall_id where mrd.apply_date = #{applyDate} and mr.recipe_id = #{recipeId} From 9afb8a09496ae60b679dcae63d681f5a47a54a58 Mon Sep 17 00:00:00 2001 From: jiask <1069621233@qq.com> Date: Thu, 21 Aug 2025 09:40:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?jsk=20=20=E6=B7=BB=E5=8A=A0=20=20reserveLim?= =?UTF-8?q?itDay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/menu/service/impl/MenuRecipeServiceImpl.java | 4 ++-- .../core/menu/vo/AppletReserveRecipeDishesVO.java | 10 ++++++++++ .../main/resources/mapper/menu/MenuRecipeMapper.xml | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java index c0861d32..88108ecc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -303,10 +303,10 @@ public class MenuRecipeServiceImpl extends ServiceImpl Date: Fri, 22 Aug 2025 10:49:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?JSK=20=E8=A7=A3=E5=86=B3=E9=A2=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=99=90=E5=88=B6=E6=97=A5=E6=9C=9F=E4=B8=BA0?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E9=97=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allocation/api/GlobalMetadataApi.java | 12 +++- .../canteen/mapper/AllocStallMapper.java | 3 + .../service/impl/AllocStallServiceImpl.java | 64 +++++++++++-------- .../impl/OrderPlaceMobileBusinessImplV3.java | 2 + .../mapper/alloc/canteen/AllocStallMapper.xml | 17 +++++ 5 files changed, 69 insertions(+), 29 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java index c2b8d133..529dcbb6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/GlobalMetadataApi.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.allocation.api; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.bonus.canteen.core.allocation.canteen.mapper.AllocStallMapper; import com.bonus.common.houqin.constant.LeConstants; import com.bonus.canteen.core.allocation.alloc.model.AllocMetadata; import com.bonus.canteen.core.allocation.alloc.service.AllocMetadataService; @@ -16,6 +17,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -28,6 +30,9 @@ public class GlobalMetadataApi { @Lazy private AllocMetadataService allocMetadataService; + @Resource + private AllocStallMapper allocStallMapper; + @Resource @Lazy private AllocStallApi allocStallApi; @@ -116,7 +121,12 @@ public class GlobalMetadataApi { } public T getAvailableModel(MetadataModelTypeEnum modelTypeEnum, T t, Long canteenId, Long stallId) { - List metadataList = this.getAvailableList(modelTypeEnum, canteenId, stallId); + List metadataList =new ArrayList<>(); + if("order".equals(modelTypeEnum.getKey())){ + metadataList=allocStallMapper.queryAvailableOrder(modelTypeEnum.getKey(),canteenId,stallId); + }else{ + metadataList = this.getAvailableList(modelTypeEnum, canteenId, stallId); + } return MetadataUtil.transferToPayModel(metadataList, t); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java index 0cecb06e..f22cf537 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocStallMapper.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.allocation.canteen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bonus.canteen.core.allocation.alloc.model.AllocMetadata; import com.bonus.canteen.core.allocation.canteen.model.AllocStall; import com.bonus.canteen.core.allocation.canteen.vo.AllocCanteenStallVO; import org.apache.ibatis.annotations.Mapper; @@ -16,4 +17,6 @@ public interface AllocStallMapper extends BaseMapper { List listAllCanteenStall(@Param("canteenId") Long canteenId); String getStallNameByIdSet(@Param("stallIdSet") Set stallIdSet); + + List queryAvailableOrder(@Param("modelType") String modelType,@Param("canteenId") Long canteenId, @Param("stallId") Long stallId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java index 8902597e..1a127a54 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocStallServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.time.LocalDate; import java.util.ArrayList; import java.util.Iterator; @@ -62,6 +63,8 @@ public class AllocStallServiceImpl extends ServiceImpl listReserveDate(AllocMobileCanteenQueryDTO queryDTO) { AllocCanteenOrderDTO allocCanteenOrderDTO = this.allocOrderMetadataApi.queryAvailableOrder(queryDTO.getCanteenId(), queryDTO.getStallId()); + System.out.println("ifReserveSkipHoliday="+allocCanteenOrderDTO.getIfReserveSkipHoliday()+";reserveLimitDayNum="+allocCanteenOrderDTO.getReserveLimitDay()+"" + + ";ifAllowReserveToday="+allocCanteenOrderDTO.getIfAllowReserveToday()); String ifReserveSkipHoliday="1"; if(allocCanteenOrderDTO.getIfReserveSkipHoliday()!=null&&!"".equals(allocCanteenOrderDTO.getIfReserveSkipHoliday())){ ifReserveSkipHoliday= allocCanteenOrderDTO.getIfReserveSkipHoliday(); @@ -85,42 +88,47 @@ public class AllocStallServiceImpl extends ServiceImpl listMatchData(String skipFlagStr, Integer limitNum, String ifAllowReserveToday) { + private List listMatchData(String skipFlagStr, Integer limitNum, String ifAllowReserveToday) { log.info(String.format("查询日期,是否调过节假日:%s,天数:%d", skipFlagStr, limitNum)); List reserveDateList = new ArrayList(); - LocalDate startDate; - if ("1".equals(ifAllowReserveToday)) { - log.info("允许预定当天"); - startDate = LocalDate.now(); - } else { - log.info("不允许预定当天"); - startDate = LocalDate.now().plusDays(1L); - } - - if ("2".equals(skipFlagStr)) { - for(int i = 0; i < limitNum; ++i) { - reserveDateList.add(startDate.plusDays((long)i)); + try{ + LocalDate startDate; + if ("1".equals(ifAllowReserveToday)) { + log.info("允许预定当天"); + limitNum=limitNum+1; + startDate = LocalDate.now(); + } else { + log.info("不允许预定当天"); + startDate = LocalDate.now().plusDays(1L); } - } else { - List holidayList = this.allocHolidayApi.getHolidayList(); - for(int i = 0; i < limitNum; ++i) { - LocalDate reserveDate = startDate.plusDays((long)i); - boolean skipFlag = false; - Iterator var10 = holidayList.iterator(); + if ("2".equals(skipFlagStr)) { + for(int i = 0; i < limitNum; ++i) { + reserveDateList.add(startDate.plusDays((long)i)); + } + } else { + List holidayList = this.allocHolidayApi.getHolidayList(); - while(var10.hasNext()) { - LocalDate holiday = (LocalDate)var10.next(); - if (reserveDate.isEqual(holiday)) { - skipFlag = true; - limitNum = limitNum + 1; + for(int i = 0; i < limitNum; ++i) { + LocalDate reserveDate = startDate.plusDays((long)i); + boolean skipFlag = false; + Iterator var10 = holidayList.iterator(); + + while(var10.hasNext()) { + LocalDate holiday = (LocalDate)var10.next(); + if (reserveDate.isEqual(holiday)) { + skipFlag = true; + limitNum = limitNum + 1; + } + } + + if (!skipFlag) { + reserveDateList.add(reserveDate); } } - - if (!skipFlag) { - reserveDateList.add(reserveDate); - } } + }catch (Exception e){ + e.printStackTrace(); } return reserveDateList; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java index e8b5ed9a..0f7ec255 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java @@ -235,9 +235,11 @@ public class OrderPlaceMobileBusinessImplV3 implements OrderPlaceMobileBusiness , (Long) LeNumUtil.reduceField(reserveMealDTO.getReserveMealList(), OrderReserveMealDTO::getCanteenId , (Object)null), (Long)LeNumUtil.reduceField(reserveMealDTO.getReserveMealList() , OrderReserveMealDTO::getStallId, (Object)null), headerDTO.getOpenid(), custInfo, reserveMealDTO); + OrderSavePO orderSavePO = this.packageOrderInfo(reserveMealDTO, reserveMealDTO.getReserveMealList(), payDTO); this.reserveMealOrderPlaceCheck(orderSavePO.getOrderInfoList(), orderSavePO.getOrderDetailList() , orderSavePO.getOrderDeliveryList()); + if (LeConstants.COMMON_NO.equals(reserveMealDTO.getIfTrial())) { this.orderPlaceBusiness.orderHandlerLock(orderSavePO.getMacOrderId(), OrderCacheConstants.MOBILE_PAY_INTERVAL); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/canteen/AllocStallMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/canteen/AllocStallMapper.xml index e3342a0a..a92d0e60 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/canteen/AllocStallMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/alloc/canteen/AllocStallMapper.xml @@ -13,5 +13,22 @@ #{stallId} +