运营平台PC-设备管理费-增加设备是否冻结筛选

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

@@ -244,7 +244,6 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
             MercDto.Vo merc = mercService.obj(new MercDto.Vo().setId(mercId)).getData();
             // 佣金配置查询
             MercFeeConfigDto.FeeConfigByMercVO mercFeeConfig = R.feignCheckData(mercFeeConfigService.getFeeConfigByMerc(new MercFeeConfigDto.FeeConfigByMerc().setMercCode(merc.getMercCode())));
-            log.info("商户：{}，设备管理费佣金", mercId, JSONUtil.toJsonPrettyStr(mercFeeConfig));
             // 设备管理费佣金
             Integer feeDevice = mercFeeConfig.getFeeDevice();
             for (DeviceChargingDto.PageVo record : records) {

device-api-service/src/main/resources/mapper/DeviceChargingMapper.xml

@@ -54,6 +54,10 @@
         <if test="queryPage.deviceId != null">
             and di.device_id = #{queryPage.deviceId}
         </if>
+        <if test="queryPage.freezeStatus != null">
+            and di.freeze_status = #{queryPage.freezeStatus}
+        </if>
+
         <if test="queryPage.chargingStatus != null and queryPage.chargingStatus != ''">
             <!-- 即将过期 -->
             <if test="queryPage.chargingStatus == 1">

device-api/src/main/java/com/xy/dto/DeviceChargingDto.java

@@ -84,6 +84,10 @@ public class DeviceChargingDto {
         @ApiModelProperty("设备id")
         private Long deviceId;
 
+        @ApiModelProperty("是否已冻结")
+        private Boolean freezeStatus;
+
+
         @ApiModelProperty("状态类型 字典=device_charging_query_type")
         private Integer chargingStatus;