From 7fc504b2def4655c00d844833901ade562b27db8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 20:12:37 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 0b19f67..6e2d2d4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -307,8 +307,8 @@
.replace("{param3}",DateUtil.getDateLongSlash(model.getBtDate()))
.replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
.replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
- Constants.formatBigdecimal(model.getBtFee()).intValue()
- :(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
+ Constants.formatBigdecimal2Float(model.getBtFee()).intValue()
+ :(Constants.formatBigdecimal2Float(model.getBtFee()).intValue() * -1))+"" );
return str;
}
private String getbackRentLogByParam(YwContract model) {
@@ -410,7 +410,7 @@
}
if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()<param.getBtDate().getTime()){
+ if(bill.getStartDate().getTime()<=param.getBtDate().getTime()){
canBills.add(bill);
}else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
@@ -450,14 +450,14 @@
BigDecimal totalBackFee = new BigDecimal(0);
if(canBills.size()>0){
- //鐩存帴鍏抽棴鍏抽棴璐﹀崟
+ //
for(YwContractBill b : canBills){
BigDecimal fee = new BigDecimal(0);
YwContractBill editBill = getEditBillFromListByParam(b,param.getCanBackRentBills());
if(editBill != null){
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
//濡傛灉璐﹀崟淇℃伅鍋氫簡缂栬緫锛岄噾棰濊绠� 瀹炴敹閲戦 鍜� 淇敼鍚庡簲鏀堕噾棰濅綔瀵规瘮锛屽垽鏂槸鍚﹀簲璇ラ��娆�
- fee = Constants.formatBigdecimal(b.getActReceivableFee()).subtract(editBill.getReceivableFee());
+ fee = editBill.getReceivableFee().subtract(Constants.formatBigdecimal(b.getActReceivableFee()));
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
b.setPayStatus(Constants.ONE);
@@ -495,13 +495,13 @@
}
if(Constants.equalsInteger(addBill.getBillType(),Constants.ZERO)){
//濡傛灉鏄敹娆�
- totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+// totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
addBill.setPayStatus(Constants.ZERO);
- addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getReceivableFee()));
}else{
//濡傛灉鏄粯娆�
addBill.setPayStatus(Constants.THREE);
- addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()).multiply(new BigDecimal(-1)));
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getReceivableFee()).multiply(new BigDecimal(-1)));
}
totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getBtFee()));
addBill.setEditDate(param.getEditDate());
@@ -530,12 +530,20 @@
yjBill.setEditDate(param.getEditDate());
yjBill.setEditor(param.getEditor());
yjBill.setReceivableFee(BigDecimal.ZERO);
- yjBill.setPayStatus(Constants.FOUR);
- yjBill.setPlanPayDate(canBill.getPlanPayDate());
+ if(Constants.formatBigdecimal(canBill.getActReceivableFee()).compareTo(new BigDecimal(0)) == 0){
+ //鏈敮浠樼殑鎶奸噾锛岀洿鎺ュ叧闂�
+ yjBill.setStatus(Constants.ONE);
+ closeBills.add(yjBill);
+ }else{
+ yjBill.setBtFee(Constants.formatBigdecimal(canBill.getActReceivableFee()).multiply(new BigDecimal(-1)));
+ yjBill.setPayStatus(Constants.FOUR);
+ yjBill.setPlanPayDate(canBill.getPlanPayDate());
+ totalBackFee = totalBackFee.add(Constants.formatBigdecimal(yjBill.getBtFee()));
+ yjNoBills ++;
+ }
ywContractBillMapper.updateById(yjBill);
}
}
- yjNoBills ++;
}
}
param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
@@ -1307,7 +1315,7 @@
}
model.setCanBackRentBills(new ArrayList<>());
long nowStart = Utils.Date.getStart(date).getTime();
- long nowEnd = Utils.Date.getEnd(date).getTime();
+ long nowEnd = Utils.Date.getDayEnd(date).getTime();
if(model.getBillList()!=null && model.getBillList().size()>0){
for(YwContractBill bill: model.getBillList()){
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
@@ -1490,6 +1498,11 @@
queryWrapper.ge(YwContract::getWyFreeEndDate, Utils.Date.getStart(pageWrap.getModel().getWyFreeEndDate()));
queryWrapper.le(YwContract::getWyFreeEndDate, Utils.Date.getEnd(pageWrap.getModel().getWyFreeEndDate()));
}
+
+
+
+
+
if (pageWrap.getModel().getZlTotalFee() != null) {
queryWrapper.eq(YwContract::getZlTotalFee, pageWrap.getModel().getZlTotalFee());
}
--
Gitblit v1.9.3