优化设备自定义二维码

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

@@ -220,9 +220,9 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
         //默认二维码
         String qrUrl = SysDictUtils.getValue(EnumDeviceQrCode.Code.CODE.getCode(), EnumDeviceQrCode.URL.getCode(), String.class);
         //查询商户特有二维码地址
-        DeviceInfo deviceInfo = deviceInfoService.getById(qrcode.getDeviceId());
-        if (Emptys.check(deviceInfo) && Emptys.check(deviceInfo.getMercId())) {
-            MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceInfo.getMercId())).getData();
+        DeviceCreateIds deviceCreateIds = getById(qrcode.getDeviceId());
+        if (Emptys.check(deviceCreateIds.getDeviceQrMercId())) {
+            MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceCreateIds.getDeviceQrMercId())).getData();
             if (Emptys.check(mercDeviceQrConfig)) {
                 qrUrl = mercDeviceQrConfig.getQrUrl() + "?deviceId=";
             }
@@ -234,7 +234,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
                 .set(qrUrl + deviceId);
         JList<String> deviceIdInfos = new JArrayList<String>()
                 .set(deviceId);
-        DeviceCreateIds deviceCreateIds = getById(qrcode.getDeviceId());
+
         if (deviceCreateIds.getDeviceType() == deviceType) {
             deviceIds.clear();
             deviceIdInfos.clear();
@@ -263,9 +263,8 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
         deviceCreateIdss.forEach(deviceCreateIds -> {
             String qrUrl = url;
             //查询商户特有二维码地址
-            DeviceInfo deviceInfo = deviceInfoJMaps.get(deviceCreateIds.getDeviceId());
-            if (Emptys.check(deviceInfo) && Emptys.check(deviceInfo.getMercId())) {
-                MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceInfo.getMercId())).getData();
+            if (Emptys.check(deviceCreateIds.getDeviceQrMercId())) {
+                MercDeviceQrConfigDto.Vo mercDeviceQrConfig = mercDeviceQrConfigService.getQrUrl(new MercDeviceQrConfigDto.GetQrUrl().setMercId(deviceCreateIds.getDeviceQrMercId())).getData();
                 if (Emptys.check(mercDeviceQrConfig)) {
                     qrUrl = mercDeviceQrConfig.getQrUrl() + "?deviceId=";
                 }