From f8f7fbc0f334bca013a1af9151a6d913a1d50b3f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 十二月 2024 23:01:15 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 1ba30b7..25b1402 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
@@ -75,12 +75,20 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(YwContract model) {
isParamValidCreated(model);
+
+
model.setCreator(model.getLoginUserInfo().getId());
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
- model.setStatus(Constants.ZERO);
model.setEditDate(model.getCreateDate());
model.setEditor(model.getCreator());
+ if(model.getStartDate().getTime() > System.currentTimeMillis()){
+ model.setStatus(Constants.ZERO);
+ }else if(model.getStartDate().getTime() <= System.currentTimeMillis() && model.getEndDate().getTime() > System.currentTimeMillis()){
+ model.setStatus(Constants.ONE);
+ }else{
+ model.setStatus(Constants.TWO);
+ }
model.setStatus(Constants.ZERO);//寰呮墽琛�
model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
@@ -308,16 +316,19 @@
.replace("{param3}",DateUtil.getDateLongSlash(model.getBtDate()))
.replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
.replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
- Constants.formatBigdecimal2Float(model.getBtFee()).intValue()
- :(Constants.formatBigdecimal2Float(model.getBtFee()).intValue() * -1))+"" );
+ Constants.formatBigdecimal2Float(model.getBtFee())
+ :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
return str;
}
private String getbackRentLogByParam(YwContract model) {
BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
- String str = "銆愰��绉熸棩{param1}锛岄��绉熷師鍥狅細{param2},閫�绉熷崗璁腑缁熻鐨勮垂鐢ㄦ�昏{param3}鍏冦�傘��";
+ String str = "銆愰��绉熸棩{param1}锛岄��绉熷師鍥狅細{param2},閫�绉熷崗璁腑缁熻鐨勮垂鐢ㄦ�昏闇�{param4}{param5}鍏冦�傘��";
str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getBtDate()))
.replace("{param2}",StringUtils.defaultString(model.getBtInfo(),""))
- .replace("{param3}",Constants.formatBigdecimal2Float(model.getBtFee()).doubleValue()+"");
+ .replace("{param4}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
+ .replace("{param5}",(fee.compareTo(new BigDecimal(0)) >=0?
+ Constants.formatBigdecimal2Float(model.getBtFee())
+ :(Constants.formatBigdecimal2Float(model.getBtFee()).multiply(new BigDecimal(-1)))).toString());
return str;
}
@@ -354,9 +365,6 @@
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();
}
@@ -418,16 +426,8 @@
closeBills.add(bill);
noBills.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.getStartDate().getTime()>param.getBtDate().getTime()){
-// if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
//濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
noBills.add(bill);
}else{
@@ -488,8 +488,10 @@
for(YwContractBill addBill : param.getAddBillList()){
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
- addBill.setType(Constants.ONE);
+ addBill.setType(Constants.TWO);
addBill.setStatus(Constants.ZERO);
+ addBill.setTotleFee(addBill.getReceivableFee());
+ addBill.setCompanyId(param.getCompanyId());
if(Constants.equalsInteger(addBill.getFeeType(),Constants.ONE)){
addBill.setStartDate(addBill.getPlanPayDate());
addBill.setEndDate(addBill.getPlanPayDate());
@@ -1327,9 +1329,13 @@
if(model.getBillList()!=null && model.getBillList().size()>0){
for(YwContractBill bill: model.getBillList()){
//浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+ if( Constants.formatBigdecimal(bill.getReceivableFee()).compareTo(new BigDecimal(0)) ==0){
+ //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
- if(bill.getStartDate().getTime()>nowEnd){
+ if(bill.getStartDate().getTime()>nowEnd ){
//濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
continue;
}
--
Gitblit v1.9.3