developrelease_toaliyun_real
| @@ -440,14 +440,16 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| int count = 0; | int count = 0; | ||||
| if(cardSpendCountList.size() > 0) { | if(cardSpendCountList.size() > 0) { | ||||
| for (Map<String, Object> cardSpendCount : cardSpendCountList) { | for (Map<String, Object> 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"); | count += (Integer) cardSpendCount.get("buCount"); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| if(cardOrderCountList.size() > 0) { | if(cardOrderCountList.size() > 0) { | ||||
| for (Map<String, Object> cardOrderCount : cardOrderCountList) { | for (Map<String, Object> 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"); | count += (Integer) cardOrderCount.get("buCount"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -224,6 +224,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| bill.setPropertyContractId(record.getId()); | bill.setPropertyContractId(record.getId()); | ||||
| bill.setCreatetime(new Date()); | bill.setCreatetime(new Date()); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| } | |||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getNeedPay()); | bill.setNeedPay(bill.getNeedPay()); | ||||
| bill.setUpdatetime(new Date()); | bill.setUpdatetime(new Date()); | ||||
| @@ -458,6 +458,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| bill.setRentContractId(record.getId()); | bill.setRentContractId(record.getId()); | ||||
| bill.setCreatetime(new Date()); | bill.setCreatetime(new Date()); | ||||
| bill.setTenantId(record.getTenantId()); | bill.setTenantId(record.getTenantId()); | ||||
| if (bill.getReceivePay().equals(0L)) { | |||||
| bill.setStatus(EnumBillRentStatus.PAID.getCode()); | |||||
| } | |||||
| bill.setOwe(bill.getReceivePay()); | bill.setOwe(bill.getReceivePay()); | ||||
| bill.setNeedPay(bill.getNeedPay()); | bill.setNeedPay(bill.getNeedPay()); | ||||
| bill.setUpdatetime(new Date()); | bill.setUpdatetime(new Date()); | ||||