diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java index bdc03940..d94f0a74 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java @@ -70,6 +70,47 @@ public class AllocMealtimeApi { return mealtime; } + public String getMealtimeNameByTypeSet(Set mealtimeTypeSet) { + List mealtimeModelList = this.listMealtime((Long)null, (Long)null); + StringBuilder sbu = new StringBuilder(); + Iterator var4 = mealtimeModelList.iterator(); + + while(true) { + AllocMealtimeModel mealtimeModel; + do { + if (!var4.hasNext()) { + String resultStr = sbu.toString(); + if (!resultStr.isEmpty()) { + resultStr = resultStr.substring(0, resultStr.length() - 1); + } + + return resultStr; + } + + mealtimeModel = (AllocMealtimeModel)var4.next(); + } while(!CollUtil.isEmpty(mealtimeTypeSet) && !mealtimeTypeSet.contains((long)mealtimeModel.getMealtimeType())); + + sbu.append(mealtimeModel.getMealtimeName()).append(","); + } + } + + public List listMealtime(Long canteenId, Long stallId) { + List metadataList = this.globalMetadataApi.getList(MetadataModelTypeEnum.MEALTIME, canteenId, stallId); + List mealtimeList = new ArrayList(); + Iterator var5 = metadataList.iterator(); + + while(var5.hasNext()) { + AllocMetadata metadata = (AllocMetadata)var5.next(); + if (CharSequenceUtil.isNotBlank(metadata.getModelValue()) && metadata.getModelValue().contains("{")) { + AllocMealtimeModel mealtimeModel = (AllocMealtimeModel)JSONObject.parseObject(metadata.getModelValue(), AllocMealtimeModel.class); + mealtimeList.add(mealtimeModel); + } + } + + List mealtimeFinalList = (List)mealtimeList.stream().sorted(Comparator.comparing(AllocMealtimeModel::getMealtimeType)).collect(Collectors.toList()); + return mealtimeFinalList; + } + public AllocMealtimeMenuModel getAllocMealtimeMenuModel(Long stallId) { List mealtimeModelList = this.listUseAvailableMealtime((Long)null, stallId, (Integer)null); String ifAllowReserveToday = this.globalMetadataApi.getAvailableValue(MetadataModelTypeEnum.ORDER_RESERVE, "ifAllowReserveToday", (Long)null, stallId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponTmplBackServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponTmplBackServiceImpl.java index 3db2f90e..9b67f9ed 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponTmplBackServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/marketing/coupon/service/impl/MktCouponTmplBackServiceImpl.java @@ -5,6 +5,9 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import com.bonus.canteen.core.allocation.api.AllocCanteenApi; +import com.bonus.canteen.core.allocation.api.AllocMealtimeApi; +import com.bonus.canteen.core.allocation.api.AllocStallApi; import com.bonus.canteen.core.marketing.coupon.constants.MktCouponTypeEnum; import com.bonus.canteen.core.marketing.coupon.mapper.MktCouponTmplBackMapper; import com.bonus.canteen.core.marketing.coupon.model.MktCouponTmplBack; @@ -12,7 +15,6 @@ import com.bonus.canteen.core.marketing.coupon.service.MktCouponTmplBackService; import com.bonus.canteen.core.marketing.coupon.vo.MktCouponTmplBackVO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - import java.util.HashSet; import java.util.Iterator; import java.util.List;