Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
fdcc179baf
16 changed files with 68 additions and 65 deletions
  1. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  2. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java
  3. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  4. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  5. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  6. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java
  7. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  8. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java
  9. +4
    -4
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  10. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  11. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  12. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
  13. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  14. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  15. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  16. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java View File

@@ -79,10 +79,10 @@ public class WxBillDailyController extends BillBaseController {
} }
if (null != wxBillDaily.getOnlyOweOrNear()) { if (null != wxBillDaily.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize);
@@ -99,10 +99,10 @@ public class WxBillDailyController extends BillBaseController {
} }
if (null != wxBillDaily.getOnlyOweOrNear()) { if (null != wxBillDaily.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillDailyService.exportBill(request, response, wxBillDaily); wxBillDailyService.exportBill(request, response, wxBillDaily);


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java View File

@@ -58,10 +58,10 @@ public class WxBillDepositController extends BillBaseController {
} }
if (null != wxBillDeposit.getOnlyOweOrNear()) { if (null != wxBillDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
@@ -79,10 +79,10 @@ public class WxBillDepositController extends BillBaseController {
} }
if (null != wxBillDeposit.getOnlyOweOrNear()) { if (null != wxBillDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java View File

@@ -56,10 +56,10 @@ public class WxBillOtherController extends BillBaseController {
} }
if (null != wxBillOther.getOnlyOweOrNear()) { if (null != wxBillOther.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillOther.updateTenantInfo(getTenantInfo()); wxBillOther.updateTenantInfo(getTenantInfo());
@@ -77,10 +77,10 @@ public class WxBillOtherController extends BillBaseController {
} }
if (null != wxBillOther.getOnlyOweOrNear()) { if (null != wxBillOther.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillOtherService.exportBill(request, response, wxBillOther); wxBillOtherService.exportBill(request, response, wxBillOther);


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java View File

@@ -56,10 +56,10 @@ public class WxBillOtherDepositController extends BillBaseController {
} }
if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { if (null != wxBillOtherDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); wxBillOtherDeposit.updateTenantInfo(getTenantInfo());
@@ -77,10 +77,10 @@ public class WxBillOtherDepositController extends BillBaseController {
} }
if (null != wxBillOtherDeposit.getOnlyOweOrNear()) { if (null != wxBillOtherDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillOtherDepositService.exportBill(request, response, wxBillOtherDeposit); wxBillOtherDepositService.exportBill(request, response, wxBillOtherDeposit);


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java View File

@@ -59,10 +59,10 @@ public class WxBillPropertyController extends BillBaseController {
} }
if (null != wxBillProperty.getOnlyOweOrNear()) { if (null != wxBillProperty.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
@@ -80,10 +80,10 @@ public class WxBillPropertyController extends BillBaseController {
} }
if (null != wxBillProperty.getOnlyOweOrNear()) { if (null != wxBillProperty.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillPropertyService.exportBill(request, response, wxBillProperty); wxBillPropertyService.exportBill(request, response, wxBillProperty);


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java View File

@@ -59,10 +59,10 @@ public class WxBillPropertyDepositController extends BillBaseController {
} }
if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
@@ -80,10 +80,10 @@ public class WxBillPropertyDepositController extends BillBaseController {
} }
if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) { if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java View File

@@ -58,10 +58,10 @@ public class WxBillRentController extends BillBaseController {
} }
if (null != wxBillRent.getOnlyOweOrNear()) { if (null != wxBillRent.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
@@ -80,10 +80,10 @@ public class WxBillRentController extends BillBaseController {
} }
if (null != wxBillRent.getOnlyOweOrNear()) { if (null != wxBillRent.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java View File

@@ -60,10 +60,10 @@ public class WxBillRentManageController extends BillBaseController {
} }
if (null != wxBillRentManage.getOnlyOweOrNear()) { if (null != wxBillRentManage.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC); wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
@@ -81,10 +81,10 @@ public class WxBillRentManageController extends BillBaseController {
} }
if (null != wxBillRentManage.getOnlyOweOrNear()) { if (null != wxBillRentManage.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) { }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateBefore(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays()));
} }
} }
wxBillRentManageService.exportBill(request, response, wxBillRentManage); wxBillRentManageService.exportBill(request, response, wxBillRentManage);


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java View File

@@ -100,9 +100,9 @@ public class WxBillAllHelper {
@Autowired @Autowired
private WxMallService wxMallService; private WxMallService wxMallService;
public Date getDateAfter(Integer afterDays) {
public Date getDateBefore(Integer afterDays) {
Date nowBegin = DateUtils.getDayBegin(new Date()); Date nowBegin = DateUtils.getDayBegin(new Date());
return DateUtils.getSecondsTimeAfter(afterDays*3600*24, nowBegin);
return DateUtils.getDateTimeBefore(afterDays*3600*24, nowBegin);
} }
private void updateQueryParm(WxMerchant wxMerchant,WxBillBaseEntity bill,Date starttime,Date enttime) { private void updateQueryParm(WxMerchant wxMerchant,WxBillBaseEntity bill,Date starttime,Date enttime) {
@@ -117,10 +117,10 @@ public class WxBillAllHelper {
bill.setEndtime(enttime); bill.setEndtime(enttime);
bill.setRentShopType(wxMerchant.getType()); bill.setRentShopType(wxMerchant.getType());
if (null != wxMerchant.getOweBillBeforeDays()) { if (null != wxMerchant.getOweBillBeforeDays()) {
bill.setOweBillLastTime(getDateAfter(wxMerchant.getOweBillBeforeDays()));
bill.setOweBillLastTime(getDateBefore(wxMerchant.getOweBillBeforeDays()));
} }
if (null != wxMerchant.getNearBillBeforeDays()) { if (null != wxMerchant.getNearBillBeforeDays()) {
bill.setNearBillLastTime(getDateAfter(wxMerchant.getNearBillBeforeDays()));
bill.setNearBillLastTime(getDateBefore(wxMerchant.getNearBillBeforeDays()));
} }
} }


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -82,8 +82,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
} }
private void updateQueryParam(WxBillDaily record) { private void updateQueryParam(WxBillDaily record) {
if (null != record.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0);
if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
record.setMerchantIds(merchantIds); record.setMerchantIds(merchantIds);
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java View File

@@ -98,8 +98,8 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
} }
private void setQueryParam(WxBillDeposit record) { private void setQueryParam(WxBillDeposit record) {
if (null != record.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0);
if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
record.setMerchantIds(merchantIds); record.setMerchantIds(merchantIds);
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java View File

@@ -87,8 +87,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
} }
private void updateQueryParam(WxBillOtherDeposit record) { private void updateQueryParam(WxBillOtherDeposit record) {
if (null != record.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0);
if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
record.setMerchantIds(merchantIds); record.setMerchantIds(merchantIds);
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java View File

@@ -87,8 +87,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
} }
private void updateQueryParam(WxBillOther record) { private void updateQueryParam(WxBillOther record) {
if (null != record.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0);
if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
record.setMerchantIds(merchantIds); record.setMerchantIds(merchantIds);
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java View File

@@ -91,8 +91,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
} }
private void updateQueryParam(WxBillPropertyDeposit record) { private void updateQueryParam(WxBillPropertyDeposit record) {
if (null != record.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0);
if (null != record.getFloorForRule() || null != record.getFloor() || null != record.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), record.getBuilding(), record.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
record.setMerchantIds(merchantIds); record.setMerchantIds(merchantIds);
}else { }else {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java View File

@@ -85,8 +85,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
} }
private void updateQueryParam(WxBillRentManage wxBillRentManage) { private void updateQueryParam(WxBillRentManage wxBillRentManage) {
if (null != wxBillRentManage.getFloorForRule()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), null, null, 0, 0);
if (null != wxBillRentManage.getFloorForRule() || null != wxBillRentManage.getFloor() || null != wxBillRentManage.getBuilding()) {
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(wxBillRentManage, wxBillRentManage.getFloorForRule(), wxBillRentManage.getBuilding(), wxBillRentManage.getFloor(), 0, 0);
if (null != merchantIds) { if (null != merchantIds) {
wxBillRentManage.setMerchantIds(merchantIds); wxBillRentManage.setMerchantIds(merchantIds);
}else { }else {


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -1208,7 +1208,10 @@ public class WxMerchantServiceImpl implements WxMerchantService {
} }
} }


List<Long> merchantIds = new ArrayList<Long>();
List<Long> merchantIds = record.getIds();
if (null == merchantIds) {
merchantIds = new ArrayList<Long>();
}


if (record.getCouponId() != null){ if (record.getCouponId() != null){
List<Long> couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(record.getCouponId(), record.getTenantId()); List<Long> couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(record.getCouponId(), record.getTenantId());


Loading…
Cancel
Save