Merge branch 'master' into test

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

@@ -16,6 +16,7 @@ import com.xy.entity.DeviceAdminActivate;
 import com.xy.entity.DeviceAlgorithmCharging;
 import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceInfo;
+import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceAdminActivateMapper;
 import com.xy.service.be.MercService;
 import com.xy.utils.*;
@@ -76,6 +77,9 @@ public class DeviceAdminActivateServiceImpl extends ServiceImpl<DeviceAdminActiv
         List<DeviceCharging> deviceChargings = new ArrayList<>(deviceInfos.size());
         List<DeviceAlgorithmCharging> deviceAlgorithmChargings = new ArrayList<>(deviceInfos.size());
         deviceInfos.forEach(deviceInfo -> {
+            if (deviceInfo.getActiveState() == 1) {
+                throw new CommRuntimeException(deviceInfo.getDeviceId() + "已经激活,操作失败");
+            }
             //激活对象
             deviceInfo.setActiveState(activeState)
                     .setBusyState(busyState)

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

@@ -217,7 +217,8 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                 JSONObject jsonObject = new JSONObject()
                         .set("deviceId", deviceId);
                 //设备id创建信息
-                DeviceCreateIds deviceCreateIds = deviceCreateIdsJMaps.get(deviceId);
+                DeviceCreateIds deviceCreateIds = deviceCreateIdsJMaps.get(deviceId)
+                        .setDeviceQrMercId(null);
                 JSONObject deviceCreateIdsObj = JSONUtil.parseObj(deviceCreateIds)
                         .set("bindTime", DataTime.toString(deviceCreateIds.getBindTime()))
                         .set("createTime", DataTime.toString(deviceCreateIds.getCreateTime()));