Merge remote-tracking branch 'origin/master' into prod

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -856,6 +856,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         for (DeviceInfo deviceInfo : deviceInfos) {
             Integer deviceType = deviceInfo.getDeviceType();
             Long deviceId = deviceInfo.getDeviceId();
+            // 清理点位
+            deviceInfo.setPlaceId(-1L);
 
             if (ObjectUtil.equals(deviceType, DeviceTypeEnum.TYPE5.getCode())) {
                 // 支付宝设备算法
@@ -961,9 +963,12 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 // 回收 到当前操作商户
                 deviceInfo.setMercId(dto.getMercId());
                 deviceInfo.setMercDeviceCode(StrUtil.EMPTY);
+                // 清理点位信息
+                deviceInfo.setPlaceId(-1L);
                 deviceInfo.setMercName(dto.getMercName());
                 deviceInfo.setMercCode(dto.getMercCode());
             });
+
             // 用户设备关联表清理
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfo::getDeviceId).collect(Collectors.toList());
             R.feignCheckData(mercService.unBindSubMercDevice(new MiniDeviceInfoDto.MercDeviceUnBindDto().setDeviceIds(deviceIds)));
@@ -990,6 +995,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 deviceInfo.setMercDeviceCode(StrUtil.EMPTY);
                 deviceInfo.setMercName(mercCheck.getName());
                 deviceInfo.setMercCode(QA_MERC_CODE);
+                // 清理点位
+                deviceInfo.setPlaceId(-1L);
             });
             // 批量更新
             return updateBatchById(deviceInfos);