Merge remote-tracking branch 'origin/master' into prod

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/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -1346,6 +1346,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 if (CollUtil.isNotEmpty(deviceIdGoodsMap)) {
                     List<GoodsDeviceDto.Vo> goodsDevice = deviceIdGoodsMap.get(dId);
                     if (CollUtil.isNotEmpty(goodsDevice)) {
+                        //过滤商品id为1 和 2的商品
+                        goodsDevice = goodsDevice.stream().filter(g -> g.getGoodsId() != 1 && g.getGoodsId() != 2).collect(Collectors.toList());
                         device.setOnSaleNum(goodsDevice.stream().mapToInt(GoodsDeviceDto.Vo::getStock).sum());
                         device.setFillNum(goodsDevice.stream().mapToInt(GoodsDeviceDto.Vo::getFillCount).sum());
                     }
@@ -1830,6 +1832,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Integer stock = 0;
         Integer afterFillStock = 0;
         if (CollUtil.isNotEmpty(goodsDeviceList)) {
+            //goodsDeviceList 过滤商品id=1和商品id=2的商品
+            goodsDeviceList = goodsDeviceList.stream().filter(g -> g.getGoodsId() != 1 && g.getGoodsId() != 2).collect(Collectors.toList());
             stock = goodsDeviceList.stream().mapToInt(GoodsDeviceDto.Vo::getStock).sum();
             afterFillStock = goodsDeviceList.stream().mapToInt(GoodsDeviceDto.Vo::getFillCount).sum();
         }
@@ -1879,8 +1883,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 .eq(DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode())
                 .eq(DeviceInfo::getBusyState, EnumDeviceBusyStatus.N_1.getCode())
                 .eq(DeviceInfo::getShowStatus, true)
-                .eq(DeviceInfo::getFreezeStatus, EnumDeviceFreezeStatus.N_1.getCode())
-                ;
+                .eq(DeviceInfo::getFreezeStatus, EnumDeviceFreezeStatus.N_1.getCode());
         List<DeviceInfo> list = list(lqw);
         if (!Emptys.check(list)) {
             return R.ok(new ArrayList<>());

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 Integer freezeStatus;
+
+
         @ApiModelProperty("状态类型 字典=device_charging_query_type")
         private Integer chargingStatus;