npc 设备激活

device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -198,9 +198,13 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
             DeviceInfoDto.Vo dv = R.feignCheckData(deviceInfoService.obj(new DeviceInfoDto.Obj().setDeviceId(deviceId).setIsSysinfo(Boolean.TRUE)));
             DeviceSysinfoDto.Vo deviceSysinfo = dv.getDeviceSysinfo();
             if (deviceSysinfo != null && StrUtil.isNotEmpty(deviceSysinfo.getNfcSn())) {
+                String deviceName = dv.getDeviceName();
+                if (StrUtil.isEmpty(deviceName)) {
+                    deviceName = "" + deviceId;
+                }
                 //  NFC 支付宝碰一下激活
                 ActiveDeviceDTO activeDeviceDTO = new ActiveDeviceDTO().setTerminalId(String.valueOf(deviceId))
-                        .setDeviceName(dv.getDeviceName())
+                        .setDeviceName(deviceName)
                         .setBoardSn(deviceSysinfo.getDeviceSn()).setNfcSn(deviceSysinfo.getNfcSn()).setAddress(dv.getPlaceName());
                 Boolean b = R.feignCheckData(alipayDeviceService.nfcDeviceActive(activeDeviceDTO));
                 if (b) {