|
|
|
@@ -4,10 +4,9 @@ import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumBusinessConType; |
|
|
|
import com.iformall.enums.EnumBusinessFilter; |
|
|
|
import com.iformall.enums.EnumIsPreview; |
|
|
|
import com.iformall.enums.EnumRentContractType; |
|
|
|
import com.iformall.enums.EnumRentContractStatus; |
|
|
|
import com.iformall.mapper.WxBusinessMapper; |
|
|
|
import com.iformall.mapper.WxPropertyContractMapper; |
|
|
|
import com.iformall.mapper.WxRentContractMapper; |
|
|
|
@@ -20,9 +19,11 @@ import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.util.*; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@Service |
|
|
|
public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
|
@@ -80,7 +81,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
|
query.setBusinessId((Integer) e.get("id")); |
|
|
|
List<WxRentContract> rentContractList = wxRentContractMapper.select(query); |
|
|
|
for (WxRentContract dbRent:rentContractList ) { |
|
|
|
if(StringUtils.isBlank(dbRent.getRentInfo())){ |
|
|
|
if (StringUtils.isBlank(dbRent.getRentInfo()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { |
|
|
|
System.out.println("rent rentInfo is null:{}"+dbRent.getId()); |
|
|
|
continue; |
|
|
|
} |
|
|
|
@@ -99,7 +103,10 @@ public class WxBusinessServiceImpl implements WxBusinessService { |
|
|
|
pquery.setBusinessId((Integer) e.get("id")); |
|
|
|
List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.select(pquery); |
|
|
|
for (WxPropertyContract dbRent:propertyContractList) { |
|
|
|
if(StringUtils.isBlank(dbRent.getRentInfo())){ |
|
|
|
if (StringUtils.isBlank(dbRent.getRentInfo()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())) { |
|
|
|
System.out.println("property rentInfo is null:{}"+dbRent.getId()); |
|
|
|
continue; |
|
|
|
} |
|
|
|
|