bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

This commit is contained in:
gaowdong 2025-03-05 14:10:09 +08:00
parent 163d36c965
commit 9eb79aeddf
11 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocCanteenApi.java
View File

@ -122,15 +122,15 @@ public class AllocCanteenApi {
// public AllocStall getAllocStall(Long stallId) {
// return this.allocStallService.getAllocStallCache(stallId);
// }
//
// public List<AllocCanteen> listAllCanteen(Boolean containMarketFlag) {
// LambdaQueryWrapper<AllocCanteen> canteenWrapper = (LambdaQueryWrapper)Wrappers.lambdaQuery(AllocCanteen.class).eq(AllocCanteen::getIfDel, LeConstants.COMMON_NO);
// if (!Boolean.TRUE.equals(containMarketFlag)) {
// canteenWrapper.eq(AllocCanteen::getCanteenType, AllocCanteenTypeEnum.CANTEEN.getKey());
// }
//
// return this.allocCanteenService.list(canteenWrapper);
// }
public List<AllocCanteen> listAllCanteen(Boolean containMarketFlag) {
LambdaQueryWrapper<AllocCanteen> canteenWrapper = Wrappers.lambdaQuery(AllocCanteen.class).eq(AllocCanteen::getIfDel, LeConstants.COMMON_NO);
if (!Boolean.TRUE.equals(containMarketFlag)) {
canteenWrapper.eq(AllocCanteen::getCanteenType, AllocCanteenTypeEnum.CANTEEN.getKey());
}
return this.allocCanteenService.list(canteenWrapper);
}
//
// public List<AllocCanteen> queryCanteenByCanteenNameList(List<String> canteenNameList) {
// return this.allocCanteenService.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(AllocCanteen.class).in(AllocCanteen::getCanteenName, canteenNameList)).eq(AllocCanteen::getIfDel, LeConstants.COMMON_NO));

15
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/api/AllocMealtimeApi.java
View File

@ -288,21 +288,6 @@ public class AllocMealtimeApi {
DeviceMqMessage.deviceUpdateIntervalConfigV4((new MQIntervalConfigVO()).setCanteenId(canteenId).setShopstallId(stallId));
}
public List<AllocMealtimeModel> listMealtime(Long canteenId, Long stallId) {
List<AllocMetadata> metadataList = this.globalMetadataApi.getList(MetadataModelTypeEnum.MEALTIME, canteenId, stallId);
List<AllocMealtimeModel> mealtimeList = new ArrayList<>();
for (AllocMetadata metadata : metadataList) {
if (CharSequenceUtil.isNotBlank(metadata.getModelValue()) && metadata.getModelValue().contains("{")) {
AllocMealtimeModel mealtimeModel = JSONObject.parseObject(metadata.getModelValue(), AllocMealtimeModel.class);
mealtimeList.add(mealtimeModel);
}
}
return mealtimeList.stream().sorted(Comparator.comparing(AllocMealtimeModel::getMealtimeType)).collect(Collectors.toList());
}
public List<AllocMealtimeModel> listUseMealtimeForApplet(Long canteenId, Long stallId, LocalDate queryDate) {
List<AllocMealtimeModel> mealtimeModelList = this.listUseAvailableMealtime(canteenId, stallId, LeConstants.COMMON_YES);
if (!ObjectUtil.isNull(queryDate) && LocalDate.now().isEqual(queryDate)) {

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/controller/AllocMealtimeController.java
View File

@ -8,7 +8,6 @@ import com.bonus.common.houqin.constant.LeConstants;
import com.bonus.common.houqin.encrypt.RequiresGuest;
import com.bonus.canteen.core.allocation.canteen.param.AllocCanteenStallParam;
import com.bonus.canteen.core.menu.model.AllocMealtimeModel;
import com.bonus.common.houqin.framework.annotation.RequiresGuest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/mapper/AllocMealLineMapper.java
View File

@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bonus.canteen.core.allocation.canteen.model.AllocMealLine;
import com.bonus.canteen.core.allocation.canteen.param.AllocCanteenStallPageParam;
import com.bonus.canteen.core.allocation.canteen.vo.AllocMealLineVO;
import com.bonus.canteen.core.autth.config.LeNiuDataPermission;
import com.bonus.canteen.core.autth.enums.DataPermissionTypeEnum;
import com.bonus.canteen.core.auth.config.LeNiuDataPermission;
import com.bonus.canteen.core.auth.enums.DataPermissionTypeEnum;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/canteen/service/impl/AllocMealLineServiceImpl.java
View File

@ -1,8 +1,9 @@
package com.bonus.canteen.core.allocation.canteen.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bonus.canteen.core.allocation.canteen.mapper.AllocMealLineMapper;
import com.bonus.canteen.core.allocation.canteen.mapper.AllocStallMapper;
import com.bonus.canteen.core.allocation.canteen.model.AllocMealLine;
@ -10,21 +11,13 @@ import com.bonus.canteen.core.allocation.canteen.param.AllocCanteenStallPagePara
import com.bonus.canteen.core.allocation.canteen.service.AllocAreaService;
import com.bonus.canteen.core.allocation.canteen.service.AllocMealLineService;
import com.bonus.canteen.core.allocation.canteen.vo.AllocMealLineVO;
import com.bonus.canteen.core.order.utils.LeNumUtil;
import com.bonus.common.houqin.constant.LeConstants;
import com.bonus.common.houqin.utils.AesEncryptUtil;
import com.bonus.common.houqin.utils.LeBeanUtil;
import com.bonus.canteen.core.order.utils.LeNumUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.invoke.SerializedLambda;
import java.util.Iterator;
import java.util.List;
import javax.annotation.Resource;
@Service

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/mapper/CustInfoMapper.java
View File

@ -10,10 +10,6 @@ import com.bonus.canteen.core.customer.dto.CustJobInfoParam;
import com.bonus.canteen.core.customer.dto.CustPayDTO;
import com.bonus.canteen.core.customer.model.CustInfo;
import com.bonus.canteen.core.customer.po.CustomerNumByOrgIdMapperPO;
import com.bonus.canteen.core.customer.vo.CustInfoForRechargeVO;
import com.bonus.canteen.core.customer.vo.CustInfoVo;
import com.bonus.canteen.core.customer.vo.CustPayVO;
import com.bonus.canteen.core.customer.vo.PageCustInfoPhotoVO;
import com.bonus.canteen.core.customer.vo.*;
import com.bonus.canteen.core.order.vo.MacOrdCurrWriteOffVO;
import com.bonus.common.houqin.domain.CustCasual;

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java
View File

@ -1,6 +1,8 @@
package com.bonus.canteen.core.menu.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
import com.bonus.canteen.core.menu.dto.AppletDishesDetailDTO;
import com.bonus.canteen.core.menu.dto.MenuDishesExportDTO;
@ -16,6 +18,7 @@ import com.bonus.canteen.core.menu.vo.*;
import com.bonus.canteen.core.nutrition.common.po.DishNutritionParam;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Set;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuCustomDictServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bonus.canteen.core.customer.utils.Executors;
import com.bonus.canteen.core.data.dataset.Executors;
import com.bonus.canteen.core.menu.constant.MenuConstant;
import com.bonus.canteen.core.menu.constant.MenuCustomIfUseEnum;
import com.bonus.canteen.core.menu.entity.MenuCustomDict;

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java
View File

@ -22,8 +22,8 @@ import com.bonus.canteen.core.allocation.canteen.model.AllocCanteen;
import com.bonus.canteen.core.allocation.canteen.model.AllocStall;
import com.bonus.canteen.core.allocation.canteen.service.AllocAreaService;
import com.bonus.canteen.core.allocation.canteen.service.AllocStallService;
import com.bonus.canteen.core.autth.api.MgrAuthApi;
import com.bonus.canteen.core.autth.po.MgrUserAuthPO;
import com.bonus.canteen.core.auth.api.MgrAuthApi;
import com.bonus.canteen.core.auth.po.MgrUserAuthPO;
import com.bonus.canteen.core.common.config.excel.EasyExcelUtil;
import com.bonus.canteen.core.common.constant.LeMqConstant;
import com.bonus.canteen.core.common.enums.FileUploadSourceEnum;
@ -43,21 +43,21 @@ import com.bonus.canteen.core.menu.model.MenuBaseDishesModel;
import com.bonus.canteen.core.menu.model.MenuDishesCostModel;
import com.bonus.canteen.core.menu.model.MenuMetadataModel;
import com.bonus.canteen.core.menu.service.*;
import com.bonus.canteen.core.menu.utils.NutritionEntity;
import com.bonus.canteen.core.menu.utils.NutritionEntityUtil;
import com.bonus.canteen.core.menu.utils.PinyinUtil;
import com.bonus.canteen.core.menu.vo.*;
import com.bonus.canteen.core.menuai.api.MenuaiServiceApi;
import com.bonus.canteen.core.menuai.dto.MenuaiDishesNameEditDTO;
import com.bonus.canteen.core.menuai.entity.MenuaiPicture;
import com.bonus.canteen.core.menuai.mapper.MenuaiPictureMapper;
import com.bonus.canteen.core.menuai.service.MenuaiV4Service;
import com.bonus.canteen.core.merchant.dto.MenuaiPictureRemoveDTO;
import com.bonus.canteen.core.menuai.mapper.MenuaiPictureMapper;
import com.bonus.canteen.core.order.mq.MqUtil;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.houqin.constant.DelFlagEnum;
import com.bonus.common.houqin.constant.LeConstants;
import com.bonus.canteen.core.menu.utils.NutritionEntity;
import com.bonus.common.houqin.i18n.I18n;
import com.bonus.common.houqin.oss.OssProperties;
import com.bonus.common.houqin.oss.service.OssTemplate;
@ -72,7 +72,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.data.redis.core.StringRedisTemplate;

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/merchant/api/MercMerchantApi.java
View File

@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.bonus.canteen.core.common.utils.TenantContextHolder;
import com.bonus.canteen.core.data.dataset.Executors;
import com.bonus.canteen.core.customer.utils.Executors;
import com.bonus.canteen.core.merchant.entity.MercMerchant;
import com.bonus.canteen.core.merchant.entity.MercMerchantInSystem;
import com.bonus.canteen.core.merchant.mapper.MercMerchantInSystemMapper;
import com.bonus.canteen.core.merchant.mapper.MercMerchantMapper;
import com.bonus.common.houqin.constant.LeConstants;

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/device/manage/DeviceInfoMapper.xml
View File

@ -452,7 +452,7 @@
<!-- </if>-->
<!-- </select>-->
</select>