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 1b3df48ef..eb542c741 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -264,6 +264,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode()); List retList = wxBillPropertyMapper.findList(wxBillRent); //非一次性的有这个属性 + wxBillRent.setHasFeesStardarsId(EnumYesOrNo.YES.getCode()); wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); List unFixedList = wxBillPropertyMapper.findList(wxBillRent); Map> childMap = null; @@ -275,6 +276,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService List childList = childMap.get(ub.getParentBillId()); if (null == childList) { childList = new ArrayList(); + childMap.put(ub.getParentBillId(), childList); } childList.add(ub); } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 8024882ea..a1c1b57af 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -93,9 +93,9 @@ and `parent_bill_id` = #{parentBillId} and `fees_standars_id` = #{feesStandarsId} and `parent_bill_id` is not null - and `parent_bill_id` null + and `parent_bill_id` is null and `fees_standars_id` is not null - and `fees_standars_id` null + and `fees_standars_id` is null and (`last_owe_call_time` is not null and `receive_pay` - `pay` > 0 and status not in (3,6,7) ) @@ -172,9 +172,9 @@ and br.`parent_bill_id` = #{parentBillId} and br.`fees_standars_id` = #{feesStandarsId} and br.`parent_bill_id` is not null - and br.`parent_bill_id` null + and br.`parent_bill_id` is null and br.`fees_standars_id` is not null - and br.`fees_standars_id` null + and br.`fees_standars_id` is null and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) )