diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index b0e6ebaa3..c0abcb402 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; + import java.util.List; import java.util.Map; @@ -42,4 +43,5 @@ public interface WxBillPropertyMapper extends CommonMapper void insertBills(List resultList); + WxBillProperty selectBillOne(WxBillProperty propertyQuery); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 633a28660..75d19c526 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -41,4 +41,6 @@ public interface WxBillRentMapper extends CommonMapper { void updateBills(@Param("bills") List resultList); + WxBillRent selectBillOne(WxBillRent rentQuery); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 048f2b469..9857ae800 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -967,7 +967,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { rentQuery.setRentShopType(EnumRentShopType.POINT.getCode()); } rentQuery.setIsPreview(EnumIsPreview.NO.getCode()); - WxBillRent rent = wxBillRentMapper.selectOne(rentQuery); + WxBillRent rent = wxBillRentMapper.selectBillOne(rentQuery); if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (rent.getOwe() <= pay) { @@ -992,7 +992,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { propertyQuery.setRentShopType(EnumRentShopType.POINT.getCode()); } propertyQuery.setIsPreview(EnumIsPreview.NO.getCode()); - WxBillProperty property = wxBillPropertyMapper.selectOne(propertyQuery); + WxBillProperty property = wxBillPropertyMapper.selectBillOne(propertyQuery); if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); if (property.getOwe() <= pay) { diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index db257e5cd..f87b8f6e1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -217,6 +217,12 @@ where id = #{item.id} + + diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 569722623..ef9c568b7 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -216,7 +216,12 @@ where id = #{item.id} - + +