diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/AppDiningPlatesController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/AppDiningPlatesController.java index c62e2bdf..5d8a450b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/AppDiningPlatesController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/diningplates/AppDiningPlatesController.java @@ -76,14 +76,12 @@ public class AppDiningPlatesController { @GetMapping("/checkBindAndUnBind") @Operation(summary = "餐盘解绑") public CommonResult checkBindAndUnBind(String diningPlatesNum,Long storeId) { - Boolean b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId); + String b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId); CommonResult result = new CommonResult<>(); result.setCode(200); - if (b) { + result.setData(b); + if ("bind".equals(b)) { result.setMsg("餐盘已解绑"); - result.setData("bind"); - }else { - result.setData("unbind"); } return result; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java index 5d460df4..3504883c 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java @@ -104,5 +104,5 @@ public interface DiningPlatesService { */ List getBindDiningPlatesList(); - Boolean checkBindAndUnBind(String diningPlatesNum,Long storeId); + String checkBindAndUnBind(String diningPlatesNum,Long storeId); } \ No newline at end of file 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 9662f345..d6a20af9 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 @@ -444,15 +444,17 @@ public class DiningPlatesServiceImpl implements DiningPlatesService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean checkBindAndUnBind(String diningPlatesNum,Long storeId) { + public String checkBindAndUnBind(String diningPlatesNum,Long storeId) { DiningPlatesDO diningPlatesDO = diningPlatesMapper.selectOne(Wrappers.lambdaQuery() .eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum) .eq(DiningPlatesDO::getStoreId, storeId)); - if(diningPlatesDO == null || diningPlatesDO.getUserId() == null){ - return false; + if(diningPlatesDO == null ) { + return "absent"; + }else if (diningPlatesDO.getUserId() == null){ + return "unbind"; }else { unbind(diningPlatesNum,storeId); - return true; + return "bind"; } } } \ No newline at end of file