From 095a5eefde07833ce0d24a6654e1b322ef07e2d4 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Aug 2024 19:56:05 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/WxMallAdminController.java | 10 ++++++++++ .../java/com/iformall/domain/po/WxEnergyMeter.java | 2 ++ .../com/iformall/domain/po/WxEnergyMeterShopFloor.java | 2 ++ .../resources/mapper/WxEnergyMeterShopFloorMapper.xml | 6 ++++++ 4 files changed, 20 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index ebdf904c2..838c4a14e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -390,6 +390,16 @@ public class WxMallAdminController extends BaseController { WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor(); sfq.updateTenantInfo(record); sfq.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); + if (StringUtils.isNotBlank(record.getShopNumber())) { + WxShop sq = new WxShop(); + sq.updateTenantInfo(record); + sq.setShopNumber(record.getShopNumber()); + List sids = wxShopService.getShopIds(sq); + if (null == sids || sids.size() <= 0 ) { + return new ResultData(); + } + sfq.setAliseIdList(sids); + } sfq.setAliseId(record.getShopId()); List mids = wxEnergyService.getMeterIdList(sfq); if (null == mids || mids.size() <= 0 ) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java index 4563c10d4..34f168892 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java @@ -94,6 +94,8 @@ public class WxEnergyMeter extends TenantEntity { @TableField(exist = false) private Long shopId; @TableField(exist = false) + private String shopNumber; + @TableField(exist = false) private List physicsTypeList; @TableField(exist = false) private Integer isRealMeter; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java index 88e44a8e7..d000b8232 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java @@ -49,6 +49,8 @@ public class WxEnergyMeterShopFloor extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "关联的编号", name = "aliseId") private Long aliseId; + @TableField(exist = false) + private List aliseIdList; @TableField(exist = false) private List shopIds; diff --git a/mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml index 78a11d049..92de0fdf4 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml @@ -28,6 +28,12 @@ and `type` = #{type} and `meter_id` = #{meterId} and `alise_id` = #{aliseId} + + and alise_id in + + #{aidItem} + + and type in