| @@ -110,10 +110,10 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| return true; | return true; | ||||
| if ("com.iformall.mapper.WxBusinessMapper.devoteList".equals(ms.getId())) | if ("com.iformall.mapper.WxBusinessMapper.devoteList".equals(ms.getId())) | ||||
| return true; | return true; | ||||
| if ("com.iformall.mapper.WxBillRentMapper.findLatePayBill".equals(ms.getId())) | if ("com.iformall.mapper.WxBillRentMapper.findLatePayBill".equals(ms.getId())) | ||||
| return true; | return true; | ||||
| if ("com.iformall.mapper.WxBillPropertyMapper.findLatePayBill".equals(ms.getId())) | |||||
| return true; | |||||
| return false; | return false; | ||||
| } | } | ||||
| } | } | ||||
| @@ -45,7 +45,7 @@ public class LatePayBillActionSchedule { | |||||
| billAction.setUserName("系统端"); | billAction.setUserName("系统端"); | ||||
| billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); | billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); | ||||
| billAction.setBillId(wxBillRent.getId()); | 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()+"元"); | billAction.setDetails("系统计入"+ divide.toString()+"元"); | ||||
| wxBillActionMapper.insertSelective(billAction); | wxBillActionMapper.insertSelective(billAction); | ||||
| } | } | ||||
| @@ -57,7 +57,7 @@ public class LatePayBillActionSchedule { | |||||
| billAction.setUserName("系统端"); | billAction.setUserName("系统端"); | ||||
| billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); | billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); | ||||
| billAction.setBillId(wxBillRent.getId()); | 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()+"元"); | billAction.setDetails("系统计入"+ divide.toString()+"元"); | ||||
| wxBillActionMapper.insertSelective(billAction); | wxBillActionMapper.insertSelective(billAction); | ||||
| } | } | ||||
| @@ -66,7 +66,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -128,7 +128,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -237,7 +237,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -312,7 +312,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -128,7 +128,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -236,7 +236,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -347,7 +347,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | Date startPay = DateUtils.getDaySet(b.getReceiveDate(),Calendar.DATE,latePayDay); | ||||
| long dayCount = DateUtils.startToEnd(startPay,new Date()); | long dayCount = DateUtils.startToEnd(startPay,new Date()); | ||||
| if(dayCount >0) { | 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()); | b.setLatePayPrice(divide.longValue()); | ||||
| } | } | ||||
| } | } | ||||
| @@ -225,9 +225,8 @@ | |||||
| </select> | </select> | ||||
| <select id="findLatePayBill" resultMap="BaseResultMap"> | <select id="findLatePayBill" resultMap="BaseResultMap"> | ||||
| select r.* from wx_bill_property r left join wx_property_contract c on(r.`property_contract_id`=c.id) | |||||
| where c.late_pay_ratio >0 and | |||||
| DATEDIFF(now(),receive_date) >= if(c.late_pay_day=0,1,c.late_pay_day) | |||||
| select r.id,r.owe,c.late_pay_ratio from wx_bill_property r left join wx_property_contract c on(r.`property_contract_id`=c.id) | |||||
| where c.late_pay_ratio >0 and DATEDIFF(now(),receive_date) >= if(c.late_pay_day=0,1,c.late_pay_day) | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||
| @@ -226,7 +226,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findLatePayBill" resultMap="BaseResultMap"> | <select id="findLatePayBill" resultMap="BaseResultMap"> | ||||
| select r.* from wx_bill_rent r left join wx_rent_contract c on(r.`rent_contract_id`=c.id) | |||||
| select r.id,r.owe,c.late_pay_ratio from wx_bill_rent r left join wx_rent_contract c on(r.`rent_contract_id`=c.id) | |||||
| where c.late_pay_ratio >0 and | where c.late_pay_ratio >0 and | ||||
| DATEDIFF(now(),receive_date) >= if(c.late_pay_day=0,1,c.late_pay_day) | DATEDIFF(now(),receive_date) >= if(c.late_pay_day=0,1,c.late_pay_day) | ||||
| </select> | </select> | ||||