Browse Source

支付宝设备激活

谭斌 2 years ago
parent
commit
55d9ae7633

+ 6 - 5
device-api-service/src/main/java/com/xy/service/factory/device/impl/alipay/AliPayOpenDeviceFatoryImpl.java

@@ -19,8 +19,8 @@ import com.xy.entity.DeviceStatus;
 import com.xy.entity.DeviceSysinfo;
 import com.xy.error.CommRuntimeException;
 import com.xy.service.*;
-import com.xy.service.factory.device.impl.open.OpenDeviceFactoryImpl;
 import com.xy.service.factory.device.DeviceFactory;
+import com.xy.service.factory.device.impl.open.OpenDeviceFactoryImpl;
 import com.xy.utils.*;
 import com.xy.utils.enums.DeviceActiveStateEnum;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
@@ -227,10 +227,11 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
             } else {
                 //登记了 but 没有sn ,则启用扫码获取的sn
                 //调用支付宝 注册
-                Boolean regOk = R.feignCheckData(alipayDeviceService.deviceBind(new BindDeviceDTO().setTerminalId(String.valueOf(deviceId)).setBoardSn(sn)));
-                if (regOk) {
-                    deviceSysinfoService.updateById(new DeviceSysinfo().setDeviceId(deviceId).setDeviceSn(sn));
-                }
+
+            }
+            Boolean regOk = R.feignCheckData(alipayDeviceService.deviceBind(new BindDeviceDTO().setTerminalId(String.valueOf(deviceId)).setBoardSn(sn)));
+            if (regOk) {
+                deviceSysinfoService.updateById(new DeviceSysinfo().setDeviceId(deviceId).setDeviceSn(sn));
             }
             String deviceName = deviceInfo.getDeviceName();
             deviceName = StrUtil.isNotEmpty(deviceInfo.getDeviceName()) ? deviceName : String.valueOf(deviceId);