From 818cff9b3ffeb2828fe178d7f5ea1660841d9ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E7=84=B1?= <yiyan@021.com>
Date: Tue, 7 Jul 2020 22:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=AE=A0=E7=89=A9=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=96=B0=E5=A2=9E=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ifish/serviceImpl/BaseServiceImpl.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java b/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java
index ed89a68..ef8cec4 100644
--- a/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java
+++ b/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java
@@ -591,6 +591,7 @@ public class BaseServiceImpl implements BaseService {
      */
     @Override
     public Object bindPetDevice(User user, String macAddress, String storeName) {
+        System.out.println("bindPetDevice --- userId : " + user.getUserId() + ", mac : " + macAddress + ", storeName : " + storeName);
         User tmpUser = userDao.get(user.getUserId());
         //新增用户拥有设备
         DevicePetUser devicePetUser = new DevicePetUser();
@@ -608,6 +609,18 @@ public class BaseServiceImpl implements BaseService {
             device = this.deviceDao.save(device);
         } else if (!device.getHardwareType().equals("3f")) {
             return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "设备类型不匹配,请重新选择入口绑定");
+        } else {
+            List<DevicePetUser> devicePetUsers = devicePetUserDao.findByDeviceId(device.getDeviceId());
+            for (DevicePetUser petUser : devicePetUsers) {
+                if (petUser.getPriId().getUserId().intValue() == user.getUserId().intValue() && petUser.getIsMaster() == 0) {
+                    devicePetUser.getPriId().setUserId(tmpUser.getUserId());
+                    devicePetUser.getPriId().setDeviceId(device.getDeviceId());
+                    devicePetUser.setShowName("宠物笼" + (int) (Math.random() * 9000 + 1000));
+                    devicePetUser.setStoreName(storeName);
+                    devicePetUser.setIsMaster(0);
+                    this.devicePetUserDao.update(devicePetUser);
+                }
+            }
         }
 
         devicePetUser.getPriId().setUserId(tmpUser.getUserId());