From a0509eadd472a08f811fd870c77c066052438a92 Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Sun, 29 Sep 2024 11:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/diningplates/AppDiningPlatesController.java    |  8 +++-----
 .../service/diningplates/DiningPlatesService.java      |  2 +-
 .../service/diningplates/DiningPlatesServiceImpl.java  | 10 ++++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

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<String> checkBindAndUnBind(String diningPlatesNum,Long storeId) {
-        Boolean b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId);
+        String b = diningPlatesService.checkBindAndUnBind(diningPlatesNum, storeId);
         CommonResult<String> 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<String> 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.<DiningPlatesDO>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