diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 27f4cccc3..2865ffb9b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -13,6 +13,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillDailyBuildWay; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.exception.MallinkException; @@ -121,7 +122,11 @@ public class WxBillDailyController extends BillBaseController { wxBillDaily.setFloorForRule(dataRule.getFloorIds()); wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillDailyService.getBillMonthSum(wxBillDaily)); + WxBillSum sum = wxBillDailyService.getBillMonthSum(wxBillDaily); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index bc288038d..b825adb45 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BillBaseController; import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBillDepositService; @@ -100,7 +101,11 @@ public class WxBillDepositController extends BillBaseController { wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillDepositService.getBillMonthSum(wxBillDeposit)); + WxBillSum sum = wxBillDepositService.getBillMonthSum(wxBillDeposit); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index e4e15111d..458f3c892 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOther; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.service.WxBillOtherService; import com.iformall.service.helper.WxBillAllHelper; @@ -97,7 +98,11 @@ public class WxBillOtherController extends BillBaseController { wxBillOther.setFloorForRule(dataRule.getFloorIds()); wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillOtherService.getBillMonthSum(wxBillOther)); + WxBillSum sum = wxBillOtherService.getBillMonthSum(wxBillOther); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 932650571..2328cbd89 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.service.WxBillOtherDepositService; import com.iformall.service.helper.WxBillAllHelper; @@ -98,7 +99,11 @@ public class WxBillOtherDepositController extends BillBaseController { wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds()); wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillOtherDepositService.getBillMonthSum(wxBillOtherDeposit)); + WxBillSum sum = wxBillOtherDepositService.getBillMonthSum(wxBillOtherDeposit); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index 3d90a74fe..abd70fbc6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBillPropertyService; @@ -100,7 +101,11 @@ public class WxBillPropertyController extends BillBaseController { wxBillProperty.setFloorForRule(dataRule.getFloorIds()); wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillPropertyService.getBillMonthSum(wxBillProperty)); + WxBillSum sum = wxBillPropertyService.getBillMonthSum(wxBillProperty); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index a43b992f4..1507f9901 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBillPropertyDepositService; @@ -101,7 +102,11 @@ public class WxBillPropertyDepositController extends BillBaseController { wxBillPropertyDeposit.setFloorForRule(dataRule.getFloorIds()); wxBillPropertyDeposit.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillPropertyDepositService.getBillMonthSum(wxBillPropertyDeposit)); + WxBillSum sum = wxBillPropertyDepositService.getBillMonthSum(wxBillPropertyDeposit); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index a2656f762..d74bb1f73 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BillBaseController; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBillRentService; @@ -102,7 +103,11 @@ public class WxBillRentController extends BillBaseController { wxBillRent.setFloorForRule(dataRule.getFloorIds()); wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillRentService.getBillMonthSum(wxBillRent)); + WxBillSum sum = wxBillRentService.getBillMonthSum(wxBillRent); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @PostMapping("add") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java index e2a76da1c..1b8b0f330 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxBillRentManage; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillOweOrNearType; import com.iformall.enums.EnumRentContractManageFeeType; import com.iformall.enums.EnumYesOrNo; @@ -101,7 +102,11 @@ public class WxBillRentManageController extends BillBaseController { wxBillRentManage.setFloorForRule(dataRule.getFloorIds()); wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds()); } - return new ResultData(wxBillRentManageService.getBillMonthSum(wxBillRentManage)); + WxBillSum sum = wxBillRentManageService.getBillMonthSum(wxBillRentManage); + if (null == sum) { + sum = new WxBillSum(); + } + return new ResultData(sum); } @GetMapping("/detail")