diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 26e06cb53..1f7ccc2ad 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -110,10 +110,10 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.WxBusinessMapper.devoteList".equals(ms.getId())) return true; - if ("com.iformall.mapper.WxBillRentMapper.findLatePayBill".equals(ms.getId())) return true; - + if ("com.iformall.mapper.WxBillPropertyMapper.findLatePayBill".equals(ms.getId())) + return true; return false; } } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java index 584561448..96025c06b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/LatePayBillActionSchedule.java @@ -45,7 +45,7 @@ public class LatePayBillActionSchedule { billAction.setUserName("系统端"); billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); billAction.setBillId(wxBillRent.getId()); - BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); billAction.setDetails("系统计入"+ divide.toString()+"元"); wxBillActionMapper.insertSelective(billAction); } @@ -57,7 +57,7 @@ public class LatePayBillActionSchedule { billAction.setUserName("系统端"); billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); billAction.setBillId(wxBillRent.getId()); - BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); billAction.setDetails("系统计入"+ divide.toString()+"元"); wxBillActionMapper.insertSelective(billAction); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index fe89ff46f..df74fe945 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -66,7 +66,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -128,7 +128,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -237,7 +237,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -312,7 +312,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 8010b2594..13dc4ba2b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -65,7 +65,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -128,7 +128,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -236,7 +236,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } @@ -347,7 +347,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); long dayCount = DateUtils.startToEnd(startPay,new Date()); if(dayCount >0) { - BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + BigDecimal divide = new BigDecimal(b.getOwe()).multiply(new BigDecimal(b.getLatePayRatio())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); b.setLatePayPrice(divide.longValue()); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 2f7998bec..e1e88d7e7 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -225,9 +225,8 @@ diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 68a882bd3..769f12b95 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -226,7 +226,7 @@