diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index 3b3fecb63..f72027687 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,6 +1,8 @@ package com.iformall.domain.dto; +import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -14,7 +16,8 @@ import javax.persistence.Transient; * */ @Data -public class WxCUserBasicInfoDto implements Serializable{ +@EqualsAndHashCode(callSuper = true) +public class WxCUserBasicInfoDto extends BaseEntity { /** * diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java index 7fb374e63..1cc93f370 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwBox.java @@ -73,7 +73,7 @@ public class KwBox extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "最大目标数量", name = "maxTagNum") private Integer maxTagNum; - @io.swagger.annotations.ApiModelProperty(value = "已连接电表数", name = "meterCount") + @Transient private Integer meterCount; @Transient diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 017efac28..b025dd310 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -130,7 +130,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public List> listBillOweAndWaitPay(WxBillAll wxBillAll) { //更新各账单状态 - updateBillStatus(wxBillAll); + //updateBillStatus(wxBillAll); ArrayList statusList = new ArrayList<>(); statusList.add(EnumBillRentStatus.NOT_PAID.getCode()); statusList.add(EnumBillRentStatus.WAIT_PAY.getCode()); @@ -141,7 +141,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public ResultData listBill(WxBillAll wxBillAll) { //更新各账单状态 - updateBillStatus(wxBillAll); + //updateBillStatus(wxBillAll); //账单类型 if (wxBillAll.getBillTypeValue() != null) { if (wxBillAll.getBillTypeValue().equals(EnumBillType.RENT.getCode())) {