绑定宠物限制新增逻辑
This commit is contained in:
parent
3174cc6998
commit
818cff9b3f
|
|
@ -591,6 +591,7 @@ public class BaseServiceImpl implements BaseService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Object bindPetDevice(User user, String macAddress, String storeName) {
|
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());
|
User tmpUser = userDao.get(user.getUserId());
|
||||||
//新增用户拥有设备
|
//新增用户拥有设备
|
||||||
DevicePetUser devicePetUser = new DevicePetUser();
|
DevicePetUser devicePetUser = new DevicePetUser();
|
||||||
|
|
@ -608,6 +609,18 @@ public class BaseServiceImpl implements BaseService {
|
||||||
device = this.deviceDao.save(device);
|
device = this.deviceDao.save(device);
|
||||||
} else if (!device.getHardwareType().equals("3f")) {
|
} else if (!device.getHardwareType().equals("3f")) {
|
||||||
return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "设备类型不匹配,请重新选择入口绑定");
|
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());
|
devicePetUser.getPriId().setUserId(tmpUser.getUserId());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue