Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
095a5eefde
4 ha cambiato i file con 20 aggiunte e 0 eliminazioni
  1. +10
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java
  4. +6
    -0
      mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml

+ 10
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java Vedi File

@@ -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<Long> sids = wxShopService.getShopIds(sq);
if (null == sids || sids.size() <= 0 ) {
return new ResultData();
}
sfq.setAliseIdList(sids);
}
sfq.setAliseId(record.getShopId());
List<Long> mids = wxEnergyService.getMeterIdList(sfq);
if (null == mids || mids.size() <= 0 ) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeter.java Vedi File

@@ -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<Integer> physicsTypeList;
@TableField(exist = false)
private Integer isRealMeter;


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java Vedi File

@@ -49,6 +49,8 @@ public class WxEnergyMeterShopFloor extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "关联的编号", name = "aliseId")
private Long aliseId;
@TableField(exist = false)
private List<Long> aliseIdList;
@TableField(exist = false)
private List<Long> shopIds;


+ 6
- 0
mallinkService/src/main/resources/mapper/WxEnergyMeterShopFloorMapper.xml Vedi File

@@ -28,6 +28,12 @@
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != meterId ">and `meter_id` = #{meterId}</if>
<if test=" null != aliseId ">and `alise_id` = #{aliseId}</if>
<if test=" null != aliseIdList ">
and alise_id in
<foreach collection="aliseIdList" index="index" item="aidItem" open="(" separator="," close=")">
#{aidItem}
</foreach>
</if>
<if test=" null != typeList ">
and type in
<foreach collection="typeList" index="index" item="tidItem" open="(" separator="," close=")">


Caricamento…
Annulla
Salva