diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 2558545cd..d99b8ba4b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -440,14 +440,16 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { int count = 0; if(cardSpendCountList.size() > 0) { for (Map cardSpendCount : cardSpendCountList) { - if (cardSpendCount.get("subBusinessId").equals(sb.getId().toString())) { + Long subBusinessId = (Long)cardSpendCount.get("subBusinessId"); + if (subBusinessId != null && subBusinessId.equals(sb.getId())) { count += (Integer) cardSpendCount.get("buCount"); } } } if(cardOrderCountList.size() > 0) { for (Map cardOrderCount : cardOrderCountList) { - if (cardOrderCount.get("subBusiness").equals(sb.getId().toString())) { + Long subBusinessId = (Long)cardOrderCount.get("subBusiness"); + if (subBusinessId != null && subBusinessId.equals(sb.getId())) { count += (Integer) cardOrderCount.get("buCount"); } } 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 9f4ca1f61..c5c704955 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -224,6 +224,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setPropertyContractId(record.getId()); bill.setCreatetime(new Date()); bill.setTenantId(record.getTenantId()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7fe3cabf7..2ec75f5b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -458,6 +458,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setRentContractId(record.getId()); bill.setCreatetime(new Date()); bill.setTenantId(record.getTenantId()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(new Date());