瀏覽代碼

Merge branch 'bash_active' into test

李进 1 年之前
父節點
當前提交
a21b69902e

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

@@ -106,14 +106,11 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
                     .setBoardSn(deviceSysinfo.getDeviceSn()))
             );
             //调用支付宝激活
-            boolean activeOk = R.feignCheckData(alipayDeviceService.deviceActive(new BindActiveDTO()
+            R.feignCheckData(alipayDeviceService.deviceActive(new BindActiveDTO()
                     .setTerminalId(String.valueOf(deviceId))
                     .setBoardSn(deviceSysinfo.getDeviceSn())
                     .setDeviceName(StrUtil.isNotEmpty(deviceInfo.getDeviceName()) ? deviceInfo.getDeviceName() : String.valueOf(deviceId)))
             );
-            if (!activeOk) {
-                throw new CommRuntimeException("设备激活失败,请联系客服!");
-            }
         }));
         execute.end();
         return result;