From 0faee520a7dd31f7127c786bc020bda7152e5375 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 5 May 2024 18:39:09 +0800 Subject: [PATCH] fix --- .../controller/rent/WxBillAllController.java | 62 ++++++++++++++----- .../com/iformall/domain/vo/WxBillSum.java | 6 +- .../resources/mapper/WxBillDailyMapper.xml | 4 ++ .../mapper/WxBillOtherDepositMapper.xml | 5 +- .../resources/mapper/WxBillOtherMapper.xml | 3 + .../resources/mapper/WxBillPropertyMapper.xml | 3 + .../mapper/WxBillRentManageMapper.xml | 3 + .../resources/mapper/WxBillRentMapper.xml | 3 + 8 files changed, 69 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index cfbcfd6ef..8d02cd9b9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -103,6 +104,10 @@ public class WxBillAllController extends BaseController { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); } + Date starttime = wxMerchant.getStarttime(); + Date enttime = wxMerchant.getEndtime(); + wxMerchant.setStarttime(null); + wxMerchant.setEndtime(null); PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { List retList = new ArrayList(); @@ -114,51 +119,75 @@ public class WxBillAllController extends BaseController { WxBillRent br = new WxBillRent(); br.updateTenantInfo(wxMerchant); - br.setStarttime(wxMerchant.getStarttime()); - br.setEndtime(wxMerchant.getEndtime()); + br.setStarttime(starttime); + br.setEndtime(enttime); WxBillSum rentSum = wxBillRentService.getBillMonthSum(br); + if (null == rentSum) { + rentSum = new WxBillSum(); + } WxBillRentManage brm = new WxBillRentManage(); brm.updateTenantInfo(wxMerchant); - brm.setStarttime(wxMerchant.getStarttime()); - brm.setEndtime(wxMerchant.getEndtime()); + brm.setStarttime(starttime); + brm.setEndtime(enttime); WxBillSum rentManageSum = wxBillRentManageService.getBillMonthSum(brm); + if (null == rentManageSum) { + rentManageSum = new WxBillSum(); + } WxBillDeposit bd = new WxBillDeposit(); bd.updateTenantInfo(wxMerchant); - bd.setStarttime(wxMerchant.getStarttime()); - bd.setEndtime(wxMerchant.getEndtime()); + bd.setStarttime(starttime); + bd.setEndtime(enttime); WxBillSum rentDepositSum = wxBillRentDepositService.getBillMonthSum(bd); + if (null == rentDepositSum) { + rentDepositSum = new WxBillSum(); + } WxBillProperty bp = new WxBillProperty(); bp.updateTenantInfo(wxMerchant); - bp.setStarttime(wxMerchant.getStarttime()); - bp.setEndtime(wxMerchant.getEndtime()); + bp.setStarttime(starttime); + bp.setEndtime(enttime); WxBillSum propertySum = wxBillPropertyService.getBillMonthSum(bp); + if (null == propertySum) { + propertySum = new WxBillSum(); + } WxBillPropertyDeposit pd = new WxBillPropertyDeposit(); pd.updateTenantInfo(wxMerchant); - pd.setStarttime(wxMerchant.getStarttime()); - pd.setEndtime(wxMerchant.getEndtime()); + pd.setStarttime(starttime); + pd.setEndtime(enttime); WxBillSum propertyDepositSum = wxBillPropertyDepositService.getBillMonthSum(pd); + if (null == propertyDepositSum) { + propertyDepositSum = new WxBillSum(); + } WxBillDaily bdd = new WxBillDaily(); bdd.updateTenantInfo(wxMerchant); - bdd.setStarttime(wxMerchant.getStarttime()); - bdd.setEndtime(wxMerchant.getEndtime()); + bdd.setStarttime(starttime); + bdd.setEndtime(enttime); WxBillSum dailySum = wxBillDailyService.getBillMonthSum(bdd); + if (null == dailySum) { + dailySum = new WxBillSum(); + } WxBillOther bo = new WxBillOther(); bo.updateTenantInfo(wxMerchant); - bo.setStarttime(wxMerchant.getStarttime()); - bo.setEndtime(wxMerchant.getEndtime()); + bo.setStarttime(starttime); + bo.setEndtime(enttime); WxBillSum otherSum = wxBillOtherService.getBillMonthSum(bo); + if (null == otherSum) { + otherSum = new WxBillSum(); + } WxBillOtherDeposit bod = new WxBillOtherDeposit(); bod.updateTenantInfo(wxMerchant); - bod.setStarttime(wxMerchant.getStarttime()); - bod.setEndtime(wxMerchant.getEndtime()); + bod.setStarttime(starttime); + bod.setEndtime(enttime); WxBillSum otherDepositSum = wxBillOtherDepositService.getBillMonthSum(bod); + if (null == otherDepositSum) { + otherDepositSum = new WxBillSum(); + } vo.setNeedPay(calcuteSum(rentSum.getNeedPay(),rentManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); @@ -166,6 +195,7 @@ public class WxBillAllController extends BaseController { propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid())); vo.setOwe(calcuteSum(rentSum.getOwe(),rentManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); + retList.add(vo); } return new ResultData(retList); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index d920b5458..5de26b2a0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -14,15 +14,15 @@ public class WxBillSum implements Serializable { private static final long serialVersionUID = 1L; //应收总金额 - private String needPay; + private String needPay = "0"; @TableField(exist = false) private BigDecimal needPayNumber; //已收总金额 - private String paid; + private String paid = "0"; @TableField(exist = false) private BigDecimal paidNumber; //欠款 - private String owe; + private String owe = "0"; @TableField(exist = false) private BigDecimal oweNumber; diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 689d26711..2551f5e95 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -83,6 +83,10 @@ + 1 = 1 + and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`id` = #{id} and br.`merchant_id` = #{merchantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 1f374206b..017146f7d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -89,7 +89,10 @@ - and br.`id` = #{id} + 1 = 1 + and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`merchant_id` = #{merchantId} and br.`status` = #{status} diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index c65426665..b44bf62c5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -85,7 +85,10 @@ + 1 = 1 and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`merchant_id` = #{merchantId} and br.`status` = #{status} diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 93c75115f..c2b2a8a30 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -120,6 +120,9 @@ br.is_preview = 0 + and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`id` = #{id} and br.`merchant_id` = #{merchantId} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index c588d0dd2..14ae7bf93 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -102,6 +102,9 @@ 1 = 1 + and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`rent_shop_type` = #{rentShopType} and br.`status` = #{status} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 7e80bddd0..b0448358b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -122,6 +122,9 @@ br.is_preview = 0 + and br.`id` = #{id} + and br.`tenant_id` = #{tenantId} + and br.`parent_tenant_id` = #{parentTenantId} and br.`freeze` = #{freeze} and br.`rent_shop_type` = #{rentShopType} and br.`status` = #{status}