diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
index fa50afdf7..899364496 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
@@ -129,7 +129,6 @@ public class KwMeterController extends BaseController {
KwMeter kwMeter = kwMeterService.getById(id);
if (kwMeter == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
- kwMeter.setLatestRecord(kwMeterDataService.findLastRecord(id));
return new ResultData(kwMeter);
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
index 10a6a89e1..d2685f06e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java
@@ -93,7 +93,4 @@ public class KwMeter extends BaseEntity {
@Transient
private Integer merchantMeterStatus;
- @Transient
- protected KwMeterData latestRecord;
-
}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
index dcb00fb54..1b65e551d 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
@@ -415,10 +415,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (wxMerchant.getId() == null) {
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
- //检查商户名称
- if (hasMerchant(wxMerchant)) {
- return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND);
- }
+
if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) {
// 停用商户
WxMerchant oldMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchant.getId());
@@ -427,6 +424,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
logger.error("停车商户不能被删除");
return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL);
}
+ } else {
+ //检查商户名称
+ if (hasMerchant(wxMerchant)) {
+ return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND);
+ }
}
Date date = new Date();
wxMerchant.setUpdateDate(date);
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
index 89a61536f..f6f113e06 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
@@ -237,6 +237,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
bill.setPay(0L);
bill.setIsDel(EnumDelStatus.NOT_DEL.getCode());
bill.setShopId(record.getShopId());
+ bill.setExpiredDay(0L);
setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod());
if (bill.getReceivePay().equals(0L)) {
bill.setStatus(EnumBillRentStatus.PAID.getCode());
@@ -765,10 +766,13 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
public void setExpiredDay(WxBillProperty wxBillProperty,int dayType, int receivePeriod){
Date date = new Date();
+ wxBillProperty.setExpiredDay(0L);
if (wxBillProperty.getReceiveDate().before(date)) {
- long day = (wxBillProperty.getReceiveDate().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+ long day = (date.getTime() - wxBillProperty.getReceiveDate().getTime()) / (24 * 60 * 60 * 1000);
wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
- wxBillProperty.setExpiredDay(day);
+ if (day > 0) {
+ wxBillProperty.setExpiredDay(day);
+ }
} else {//截止收租日在当前时间之后
Calendar now = Calendar.getInstance();
now.add(dayType, receivePeriod);
@@ -776,10 +780,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴
if (currenttime.before(wxBillProperty.getReceiveDate())) {
wxBillProperty.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode());
- wxBillProperty.setExpiredDay(0L);
} else {
wxBillProperty.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
- wxBillProperty.setExpiredDay(0L);
}
}
}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
index 6c55c82c5..66addb343 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
@@ -1162,10 +1162,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){
//截止收租日在当前时间之前
Date date = new Date();
+ wxBillRent.setExpiredDay(0L);
if (wxBillRent.getReceiveDate().before(date)) {
- long day = (wxBillRent.getReceiveDate().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
+ long day = (date.getTime() - wxBillRent.getReceiveDate().getTime()) / (24 * 60 * 60 * 1000);
wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
- wxBillRent.setExpiredDay(day);
+ if (day > 0) {
+ wxBillRent.setExpiredDay(day);
+ }
} else {//截止收租日在当前时间之后
Calendar now = Calendar.getInstance();
now.add(dayType, receivePeriod);
@@ -1173,10 +1176,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//当前日期加上周期后小于截止收租日就是没有到期,否则当前待缴
if (currenttime.before(wxBillRent.getReceiveDate())) {
wxBillRent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode());
- wxBillRent.setExpiredDay(0L);
} else {
wxBillRent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
- wxBillRent.setExpiredDay(0L);
}
}
}
diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
index 8fae94be6..297574baa 100644
--- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
+++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml
@@ -55,32 +55,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-