From a1a8fa1b481b325fc9b8a00b3272c68df48f6900 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Mon, 2 Jan 2023 16:17:52 +0800 Subject: [PATCH] fix bug --- .../service/impl/WxRentContractServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 3cbf1eeff..2e9061116 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -689,13 +689,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setCreatetime(date); bill.updateTenantInfo(record); bill.setManageFeeType(feeType.getCode()); + Long needPay = 0L; if (feeType.getCode() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()) { - bill.setNeedPay(_bi.getBussinessManageFeeNeedPay()); - bill.setReceivePay(_bi.getBussinessManageFeeNeedPay()); + if (null != _bi.getBussinessManageFeeNeedPay()) { + needPay = _bi.getBussinessManageFeeNeedPay(); + } }else if (feeType.getCode() == EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()) { - bill.setNeedPay(_bi.getOperatingManageFeeNeedPay()); - bill.setReceivePay(_bi.getOperatingManageFeeNeedPay()); + if (null != _bi.getOperatingManageFeeNeedPay()) { + needPay = _bi.getOperatingManageFeeNeedPay(); + } } + bill.setNeedPay(needPay); + bill.setReceivePay(needPay); bill.setUpdatetime(date); bill.setRentShopType(record.getRentShopType()); bill.setPeriod(count);