zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/分账重构'

Browse Source
This commit is contained in:
zengtao01
2024-09-30 10:41:39 +08:00
parent 69fa0d59ce 0dc4181487
commit dcf372b223
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
View File

@ -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更新不存在");

13
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
View File

@ -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<AdminCardDO> adminCardList = adminCardService.getAdminCardList();
if(CollectionUtil.isNotEmpty(adminCardList)){
List<String> 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) {