From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 215 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 146 insertions(+), 69 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 0106371..002e6bd 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
@@ -33,6 +33,7 @@
import java.math.BigDecimal;
import java.time.temporal.ChronoUnit;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 杩愮淮鍚堝悓淇℃伅琛⊿ervice瀹炵幇
@@ -86,7 +87,6 @@
dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
dealRoomsForContract(model);//澶勭悊鎴挎簮鍏宠仈琛�
dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,model.getLoginUserInfo().getRealname(),"銆�"+model.getRemark().replace("鍚堝悓鎽樿锛�","")+"銆�");//璁板綍鏂板缓鏃ュ織
-
return model.getId();
}
@@ -193,7 +193,7 @@
}
for(YwContractDetail d :model.getWyDetailList()){
if( d.getStartDate() == null
- ||d.getEditDate() == null
+ ||d.getEndDate() == null
||d.getPrice() == null
||d.getCircleType() == null
|| d.getCircleType()>6
@@ -236,9 +236,9 @@
String str = "";
//璧风鏃�2024/06/01锛岀璧佹暟涓�500銕°�傞鏈熺璧佷笁鏈堜竴浠橈紝绉熼噾鍗曚环35鍏�/銕÷锋湀銆傞鏈熺墿涓氫笁鏈堜竴浠橈紝鐗╀笟鍗曚环4.3鍏�/銕÷锋湀
- String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
- String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆�";
- String str2 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岄鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}鍏儃param8}";
+ String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}{param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
+ String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}{param5}銆�";
+ String str2 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岄鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
str= str0;
}
@@ -252,10 +252,10 @@
.replace("{param2}",model.getTotalArea().intValue()+"")
.replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
.replace("{param4}",Constants.formatBigdecimal(model.getZlFirstPrice()).intValue()+"")
- .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle())
+ .replace("{param5}",Constants.getUnitTypeByNum(model.getZlFirstCircle()))
.replace("{param6}",Constants.getPayTypeByNum(model.getWyPayType()))
.replace("{param7}",Constants.formatBigdecimal(model.getWyFirstPrice()).intValue()+"")
- .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle())));
+ .replace("{param8}",Constants.getUnitTypeByNum(model.getWyFirstCircle()));
return str;
}
private String getbackRentRemarkByParam(YwContract model) {
@@ -294,11 +294,16 @@
//澶勭悊
dealBackRentBillBiz(param);
YwContract update = new YwContract();
+ update.setId(param.getId());
update.setEditDate(new Date());
update.setEditor(param.getLoginUserInfo().getId());
update.setBtActDate(update.getEditDate());
update.setBtActUserId(update.getEditor());
- update.setStatus(Constants.THREE);
+ if(Objects.nonNull(param.getBtWaitBill()) && param.getBtWaitBill() > Constants.ZERO){
+ update.setStatus(Constants.THREE);
+ }else{
+ update.setStatus(Constants.FOUR);
+ }
update.setBtInfo(param.getBtInfo());
update.setBtDate(param.getBtDate());
update.setBtType(param.getBtType());
@@ -306,8 +311,35 @@
update.setBtFee(param.getBtFee());
update.setBtRemark(getbackRentRemarkByParam(param));
ywContractMapper.updateById(update);
+// if(1==1){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+// }
dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK, param.getLoginUserInfo().getRealname(),getbackRentLogByParam(param));
return param.getId();
+ }
+
+
+ @Override
+ public void dealTimeOut(){
+ //瀹氭椂澶勭悊鍚堝悓鎵ц涓�
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.ONE)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ZERO)
+ .apply(" START_DATE < NOW() AND END_DATE > NOW() ")
+ );
+ //瀹氭椂澶勭悊鍚堝悓宸茶繃鏈�
+ ywContractMapper.update(new UpdateWrapper<YwContract>()
+ .lambda()
+ .set(YwContract::getStatus,Constants.TWO)
+ .set(YwContract::getEditDate,DateUtil.getCurrDateTime())
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ONE,Constants.ZERO)
+ .apply(" END_DATE < NOW() ")
+ );
+
}
private void dealBackRentBillBiz(YwContract param) {
@@ -319,7 +351,7 @@
List<YwContractBill> canBills = new ArrayList<>();//鍙��绉熶慨鏀规暟鎹�
List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
select("*," +
- "( select ifnull(sum(yw.ACT_RECEIVABLE_FEE),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
+ "( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
.lambda().
eq(YwContractBill::getIsdeleted,Constants.ZERO)
.eq(YwContractBill::getContractId,param.getId()));
@@ -328,7 +360,7 @@
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
// 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
if(Constants.equalsInteger(Constants.THREE,bill.getCostType())
- || Constants.equalsInteger(Constants.FOUR,bill.getCostType())
+ || Constants.equalsInteger(Constants.TWO,bill.getCostType())
||Constants.equalsInteger(Constants.SEVEN,bill.getCostType())){
//鎶奸噾鍜屼繚璇侀噾
yjBills.add(bill);
@@ -336,15 +368,23 @@
}
if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
+ if(bill.getStartDate().getTime()<param.getBtDate().getTime()){
+ canBills.add(bill);
+ }else{
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
closeBills.add(bill);
noBills.add(bill);
- }else{
- canBills.add(bill);
}
+// if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
+// //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+// closeBills.add(bill);
+// noBills.add(bill);
+// }else{
+// canBills.add(bill);
+// }
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
- if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
+ if(bill.getStartDate().getTime()>param.getBtDate().getTime()){
+// if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
noBills.add(bill);
}else{
@@ -365,16 +405,7 @@
ywContractBillMapper.updateById(b);
}
}
- int yjNoBills =0;
- if(yjBills.size()>0){
- // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
- for(YwContractBill bill : yjBills){
- if(!Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
- //濡傛灉鏄湭缁撴竻鎶奸噾
- yjNoBills ++;
- }
- }
- }
+
BigDecimal totalBackFee = new BigDecimal(0);
if(canBills.size()>0){
//鐩存帴鍏抽棴鍏抽棴璐﹀崟
@@ -387,14 +418,15 @@
fee = Constants.formatBigdecimal(b.getActReceivableFee()).subtract(editBill.getReceivableFee());
if(fee.compareTo(new BigDecimal(0))== 0){
//濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
- b.setStatus(Constants.ONE);
+ b.setPayStatus(Constants.ONE);
}else if(fee.compareTo(new BigDecimal(0))> 0){
//濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
- b.setStatus(Constants.FOUR);
+ b.setPayStatus(Constants.FOUR);
}else if(fee.compareTo(new BigDecimal(0)) < 0){
//濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
}
}
+ b.setReceivableFee(editBill.getReceivableFee());
b.setEditDate(param.getEditDate());
b.setEditor(param.getEditor());
b.setBtActDate(param.getBtActDate());
@@ -415,6 +447,10 @@
addBill.setContractId(param.getId());
addBill.setType(Constants.ONE);
addBill.setStatus(Constants.ZERO);
+ if(Constants.equalsInteger(addBill.getFeeType(),Constants.ONE)){
+ addBill.setStartDate(addBill.getPlanPayDate());
+ addBill.setEndDate(addBill.getPlanPayDate());
+ }
if(Constants.equalsInteger(addBill.getBillType(),Constants.ZERO)){
//濡傛灉鏄敹娆�
totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
@@ -437,6 +473,28 @@
newBills.add(addBill);
}
ywContractBillMapper.insert(param.getAddBillList());//鎵归噺鎻掑叆鏁版嵁
+ }
+
+ int yjNoBills =0;
+ if(yjBills.size()>0){
+ // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
+ for(YwContractBill bill : yjBills){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(param.getCanBackRentBills())){
+ List<YwContractBill> optional = param.getCanBackRentBills().stream().filter(i->Constants.equalsInteger(bill.getId(),i.getId())).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(optional)){
+ YwContractBill canBill = optional.get(Constants.ZERO);
+ YwContractBill yjBill = new YwContractBill();
+ yjBill.setId(bill.getId());
+ yjBill.setEditDate(param.getEditDate());
+ yjBill.setEditor(param.getEditor());
+ yjBill.setReceivableFee(BigDecimal.ZERO);
+ yjBill.setPayStatus(Constants.FOUR);
+ yjBill.setPlanPayDate(canBill.getPlanPayDate());
+ ywContractBillMapper.updateById(yjBill);
+ }
+ }
+ yjNoBills ++;
+ }
}
param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
param.setBtCLoseBill(closeBills.size());
@@ -466,7 +524,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍚堝悓淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲垪琛ㄥ埛鏂伴噸璇曪紒");
}
- SystemUser user = systemUserMapper.selectById(param.getUserId());
+ SystemUser user = systemUserMapper.selectById(param.getBtUserId());
if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝缁忓姙浜轰俊鎭笉瀛樺湪锛�");
}
@@ -489,7 +547,8 @@
}
private void dealDetailListBiz(YwContract model) {
- List<YwContractDetail> details = new ArrayList<>();
+ List<YwContractDetail> details1 = new ArrayList<>();
+ List<YwContractDetail> details2 = new ArrayList<>();
int num = 0;
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
|| Constants.equalsInteger(model.getType(),Constants.TWO)){
@@ -501,7 +560,7 @@
d.setType(Constants.ZERO);
d.setSortnum(num++);
d.setStatus(Constants.ZERO);
- details.add(d);
+ details1.add(d);
}
}
num = 0;
@@ -515,22 +574,28 @@
d.setContractId(model.getId());
d.setSortnum(num++);
d.setStatus(Constants.ZERO);
- details.add(d);
+ details2.add(d);
}
}
if(model.getId()!=null){
- ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ if(details1.size()>0){
+ ywContractDetailMapper.insert(details1);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
+ if(details2.size()>0){
+ ywContractDetailMapper.insert(details2);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
}
//澶勭悊璐﹀崟淇℃伅
- dealBillListBiz(model,details);
+ dealBillListBiz(model,details1,details2);
}
/**
* 鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
* @param model
- * @param details
+ * @param details1 绉熻祦鏉℃
+ * @param details2 鐗╀笟鏉℃
*/
- private void dealBillListBiz(YwContract model, List<YwContractDetail> details) {
+ private void dealBillListBiz(YwContract model, List<YwContractDetail> details1, List<YwContractDetail> details2) {
List<YwContractBill> billList1 = new ArrayList<>();
List<YwContractBill> billList2 = new ArrayList<>();
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -538,20 +603,20 @@
//濡傛灉鏈夌璧佹潯娆�
if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList1.add(initDepoistBill(Constants.THREE,model,details));
+ billList1.add(initDepoistBill(Constants.TWO,model));
}
if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList1.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParamOnce(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList1.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam3Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList1.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam6Months(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList1.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam1Year(model,details1,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -559,39 +624,36 @@
//濡傛灉鐗╀笟鏉℃
if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList2.add(initDepoistBill(Constants.FOUR,model,details));
+ billList2.add(initDepoistBill(Constants.THREE,model));
}
if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList2.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParamOnce(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList2.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam3Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList2.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam6Months(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList2.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam1Year(model,details2,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}
}
if(model.getBillType() == 0){
model.setBillList(billList1);
- }else if(model.getBillType() == 0){
+ }else if(model.getBillType() == 1){
model.setBillList(billList2);
}
int num =1;
for(int i=0;i<billList1.size();i++){
- if(Constants.equalsInteger( billList1.get(i).getCostType(),Constants.ZERO)){
- billList1.get(i).setSortnum(num++);
- }
+ billList1.get(i).setSortnum(num);
+ num++;
}
- num =1;
for(int i=0;i<billList2.size();i++){
- if(Constants.equalsInteger( billList2.get(i).getCostType(),Constants.ONE)){
- billList2.get(i).setSortnum(num++);
- }
+ billList2.get(i).setSortnum(num);
+ num++;
}
if(model.getId()!=null){
ywContractBillMapper.insert(billList1);
@@ -599,7 +661,7 @@
}
}
- private YwContractBill initDepoistBill(int type, YwContract model, List<YwContractDetail> details) {
+ private YwContractBill initDepoistBill(int type, YwContract model ) {
YwContractBill bill = new YwContractBill();
bill.setCreateDate(model.getEditDate());
bill.setCreator(model.getEditor());
@@ -613,7 +675,10 @@
bill.setType(Constants.ZERO);
bill.setCostType(type);
bill.setPlanPayDate(bill.getStartDate());
- bill.setTotleFee(type==Constants.THREE?model.getZlDeposit():model.getWyDeposit());//鎶奸噾璐圭敤
+ bill.setTotleFee(type==Constants.TWO?
+ Objects.isNull(model.getZlDeposit())?BigDecimal.ZERO:model.getZlDeposit()
+ :
+ Objects.isNull(model.getWyDeposit())?BigDecimal.ZERO:model.getWyDeposit());//鎶奸噾璐圭敤
bill.setReceivableFee(bill.getTotleFee());
bill.setBillType(Constants.ZERO);
bill.setPayStatus(Constants.ZERO);
@@ -670,7 +735,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*6));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addMonthToDate(startDate,monthSix));
+ list.add(DateUtil.addMonthToDate(startDate,monthSix*6));
}
return list;
}
@@ -685,7 +750,7 @@
list.add(DateUtil.addMonthToDate(startDate,i*3));
}
if(restMonth>0 || monthDays>0){
- list.add(DateUtil.addMonthToDate(startDate,monthThree));
+ list.add(DateUtil.addMonthToDate(startDate,monthThree*3));
}
return list;
}
@@ -712,10 +777,11 @@
private void dealCircleDateBillBiz( List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
int temp = 0;
for(Date start : dateList){
- Date end = model.getEndDate();
+ Date end = d.getEndDate();
if(temp+1 < dateList.size()){
end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
}
+ temp++;
YwContractBill bill = initCreateBillModel(model,d );
bill.setStartDate(start);//璐﹀崟寮�濮�
bill.setEndDate(end);//璐﹀崟缁撴潫
@@ -725,20 +791,16 @@
bill.setTotleFee(totalFee);
bill.setReceivableFee(totalFee);
bill.setBillType(Constants.ZERO);
-
- temp++;
bill.setCompanyId(model.getCompanyId());
list.add(bill);
}
}
-
-
private BigDecimal getTotalFeeByStartEnd(YwContract model, YwContractDetail d, YwContractBill bill,Date freeStart,Date freeEnd) {
BigDecimal totalFee = new BigDecimal(0);
- DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),bill.getEndDate(),freeStart,freeEnd);
+ DateCompare dateCompare = DateCompare.dayCompare(bill.getStartDate(),DateUtil.addDaysToDate(bill.getEndDate(),1),freeStart,DateUtil.addDaysToDate(freeEnd,1));
if(Constants.equalsInteger(d.getCircleType(),Constants.ZERO)){
//0=鍏冩瘡骞崇背澶�
- int days = dateCompare.getDay();
+ int days = dateCompare.getDay() ;
BigDecimal areas = getAreasNumBYRooms(model.getRoomList());
totalFee = new BigDecimal(days).multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.ONE)){
@@ -753,7 +815,7 @@
totalFee = year.multiply(areas).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.THREE)){
//3=鍏冩瘡澶�
- int days = dateCompare.getDay();
+ int days = dateCompare.getDay() ;
totalFee = new BigDecimal(days).multiply(Constants.formatBigdecimal(d.getPrice()));//鎬讳环鏍�
}else if(Constants.equalsInteger(d.getCircleType(),Constants.FOUR)){
//4=鍏冩瘡鏈�
@@ -1113,6 +1175,7 @@
.selectAs(YwCustomer::getName,YwContract::getRenterName )
.selectAs(YwProject::getName,YwContract::getProjectName )
.select("t3.realname",YwContract::getCreatorName )
+ .select("(select sum(r.area) from yw_contract_room cr left join yw_room r on r.id = cr.room_id where r.isdeleted=0 and cr.contract_id =t.id)",YwContract::getTotalArea )
.leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContract::getUserId)
.leftJoin(SystemUser.class,SystemUser::getId,YwContract::getCreator)
@@ -1168,9 +1231,15 @@
//鏌ヨ璐﹀崟闆嗗悎
model.setBillList(ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
.selectAll(YwContractBill.class )
+ .select(" ( select ifnull(sum(case when yw.REVENUE_TYPE = 0 then yw.ACT_RECEIVABLE_FEE else -yw.ACT_RECEIVABLE_FEE end),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
.eq( YwContractBill::getContractId,model.getId())
.eq(YwContractBill::getIsdeleted,Constants.ZERO)
.orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
+
+ for (YwContractBill ywContractBill:model.getBillList()) {
+ ywContractBill.setNeedReceivableFee(ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee()));
+ }
+
model.setCanBackRentBills(new ArrayList<>());
long nowStart = Utils.Date.getStart(new Date()).getTime();
long nowEnd = Utils.Date.getEnd(new Date()).getTime();
@@ -1188,7 +1257,7 @@
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
if(bill.getEndDate().getTime()<nowStart){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
- continue;
+ continue;
}
model.getCanBackRentBills().add(bill);
}else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
@@ -1210,10 +1279,18 @@
@Override
public List<YwContract> findList(YwContract ywContract) {
- QueryWrapper<YwContract> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(YwContract::getIsdeleted,Constants.ZERO);
- wrapper.lambda().in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO);
- return ywContractMapper.selectList(wrapper);
+ return ywContractMapper.selectJoinList(YwContract.class,new MPJLambdaWrapper<YwContract>().selectAll(YwContract.class )
+ .selectAs(Company::getName,YwContract::getCompanyName )
+ .selectAs(SystemUser::getRealname,YwContract::getUserName )
+ .selectAs(YwCustomer::getName,YwContract::getRenterName )
+ .selectAs(YwProject::getName,YwContract::getProjectName )
+ .leftJoin(Company.class,Company::getId,YwContract::getCompanyId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getUserId)
+ .leftJoin(SystemUser.class,SystemUser::getId,YwContract::getCreator)
+ .leftJoin(YwProject.class,YwProject::getId,YwContract::getProjectId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .eq(YwContract::getIsdeleted,Constants.ZERO)
+ .in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO));
}
@Override
--
Gitblit v1.9.3