diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java index c0e7af222..52efe3cca 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxAllBillMapper.java @@ -21,6 +21,8 @@ public interface WxAllBillMapper extends CommonMapper { List findContractSamePeriodSum(WxAllBill wxBillRent); + List findContractFeesSamePeriodSum(WxAllBill wxBillRent); + List getShopIdList(WxAllBill record); BigDecimal getMerchantAdvanceGroupSum(WxAllBill wxBillRent); 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 f0e638770..d1cc81bb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -330,7 +330,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillRent.setEnergyFeesId(null); wxBillRent.setBillType(EnumBillAllType.PROPERTY.getCode()); wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); - List unFixedList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent); + List unFixedList = wxAllBillMapper.findContractFeesSamePeriodSum(wxBillRent); Map> childMap = null; if (null != unFixedList && unFixedList.size() > 0 ) { childMap = new HashMap>(); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 1d7280dd1..5c7574910 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -239,6 +239,24 @@ + +