diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java index 6f6a5768..031fe59d 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java @@ -86,7 +86,7 @@ public interface ErrorCodeConstants { ErrorCode NEED_ADD_USER = new ErrorCode(1_007_901_004, "请先添加人员"); ErrorCode ADMIN_CARD_NOT_EXISTS = new ErrorCode(1_007_901_005, "管理员卡不存在"); ErrorCode CARD_NOT_EXIST = new ErrorCode(1_007_901_005, "卡号不存在"); - + ErrorCode ADMIN_CARD = new ErrorCode(1_007_901_006, "管理员餐盘无法绑定"); ErrorCode APP_UP_NOT_EXISTS = new ErrorCode(1_007_902_001, "app更新不存在"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java index d6a20af9..baf8ecbb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java @@ -12,12 +12,14 @@ import cn.iocoder.yudao.module.member.controller.admin.diningplates.vo.DiningPla import cn.iocoder.yudao.module.member.controller.admin.diningplates.vo.DiningPlatesStoreVO; import cn.iocoder.yudao.module.member.controller.app.diningplates.vo.AppUserInfo; import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoCardVO; +import cn.iocoder.yudao.module.member.dal.dataobject.admincard.AdminCardDO; import cn.iocoder.yudao.module.member.dal.dataobject.diningplates.DiningPlatesDO; import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.diningplates.DiningPlatesMapper; import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; +import cn.iocoder.yudao.module.member.service.admincard.AdminCardService; import cn.iocoder.yudao.module.member.service.card.CardService; import cn.iocoder.yudao.module.member.util.MemberConstants; import cn.iocoder.yudao.module.system.api.carteen.CarteenApi; @@ -69,6 +71,8 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { private CarteenApi carteenApi; @Resource private DishesApi dishesApi; + @Resource + private AdminCardService adminCardService; @Override public Long createDiningPlates(DiningPlatesSaveReqVO createReqVO) { @@ -292,6 +296,15 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { if (diningPlatesDO.getUserId() != null) { throw exception(DINING_PLATES_ALREADY_BIND); } + List adminCardList = adminCardService.getAdminCardList(); + if(CollectionUtil.isNotEmpty(adminCardList)){ + List collect = adminCardList.stream().map(AdminCardDO::getCardNo).collect(Collectors.toList()); + if(collect.contains(diningPlatesDO.getDiningPlatesNum())){ + throw exception(ADMIN_CARD); + } + } + + } public void checkMemberUser(MemberUserDO memberUserDo, Boolean isFace) {