From 750a718ff6a0aba23c3c8f2bc943c4d1d4870f18 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 1 Aug 2019 19:16:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=BF=87=E6=BB=A4=E5=99=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=BB=A7=E6=89=BF=E6=8E=92=E5=BA=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/dto/WxCUserBasicInfoDto.java | 5 ++++- .../src/main/java/com/iformall/domain/po/KwBox.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 From e4370751fba5afb0e63bef02d9cf85ff328223f7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 2 Aug 2019 10:37:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[B=E7=AB=AF=E8=B4=A6=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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())) {