Merge branch 'bash_active' into test

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

@@ -170,6 +170,22 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
                 }
                 updateDeviceInfos.add(updateDeviceInfo);
             }
+            //支付宝设备
+            DeviceInfo deviceInfo = deviceInfoJMap.get(deviceAlgorithmChargingHistory.getDeviceId());
+            if (deviceInfo.getDeviceType() == aliDeviceType) {
+                if (deviceAlgorithmChargingHistory.getChargingType() != 100 && deviceInfo.getActiveState() == 2) {
+                    //支付宝绑定
+                    DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfosJMaps.get(deviceAlgorithmChargingHistory.getDeviceId());
+                    BindDeviceDTO bindDeviceDTO = new BindDeviceDTO().setTerminalId(String.valueOf(deviceInfo.getDeviceId()))
+                            .setBoardSn(deviceSysinfo.getDeviceSn());
+                    //支付宝激活
+                    BindActiveDTO bindActiveDTO = new BindActiveDTO()
+                            .setTerminalId(String.valueOf(deviceInfo.getDeviceId()))
+                            .setBoardSn(deviceSysinfo.getDeviceSn())
+                            .setDeviceName(StrUtil.isNotEmpty(deviceInfo.getDeviceName()) ? deviceInfo.getDeviceName() : String.valueOf(deviceInfo.getDeviceId()));
+                    ailiActive.add(new Tuple.Tuple2<>(bindDeviceDTO, bindActiveDTO));
+                }
+            }
             Integer type = deviceAlgorithmChargingHistory.getType();
             SysDictRedis deviceAlgorithmChargingType2 = deviceAlgorithmChargingTypeMaps.get(EnumDeviceAlgorithmChargingType.N_2.getCode());
             if (type.equals(Integer.valueOf(deviceAlgorithmChargingType2.getValue()))) {
@@ -222,22 +238,6 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
                         .setUpdateTime(now);
                 save(deviceAlgorithmChargingInfo);
             }
-            //支付宝设备
-            DeviceInfo deviceInfo = deviceInfoJMap.get(deviceAlgorithmChargingHistory.getDeviceId());
-            if (deviceInfo.getDeviceType() == aliDeviceType) {
-                if (deviceAlgorithmChargingHistory.getChargingType() != 100 && deviceInfo.getActiveState() == 2) {
-                    //支付宝绑定
-                    DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfosJMaps.get(deviceAlgorithmChargingHistory.getDeviceId());
-                    BindDeviceDTO bindDeviceDTO = new BindDeviceDTO().setTerminalId(String.valueOf(deviceInfo.getDeviceId()))
-                            .setBoardSn(deviceSysinfo.getDeviceSn());
-                    //支付宝激活
-                    BindActiveDTO bindActiveDTO = new BindActiveDTO()
-                            .setTerminalId(String.valueOf(deviceInfo.getDeviceId()))
-                            .setBoardSn(deviceSysinfo.getDeviceSn())
-                            .setDeviceName(StrUtil.isNotEmpty(deviceInfo.getDeviceName()) ? deviceInfo.getDeviceName() : String.valueOf(deviceInfo.getDeviceId()));
-                    ailiActive.add(new Tuple.Tuple2<>(bindDeviceDTO, bindActiveDTO));
-                }
-            }
         });
         //处理无期限
         infs.forEach(deviceAlgorithmChargingHistory -> {