From 199b0b166e158f4606a71278dd5f532e2b87224c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 16:28:28 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 227 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 171 insertions(+), 56 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 e8e6bbc..5b5b311 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
@@ -85,6 +85,124 @@
dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
+ @Override
+ public List<YwContractBill> getBillList(YwContract model){
+ isParamValidForBill(model);
+ model.setCreateDate(new Date());
+ model.setEditDate(model.getCreateDate());
+ dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ return model.getBillList();
+ }
+
+ private void isParamValidForBill(YwContract model) {
+ if(model.getStartDate() == null
+ ||model.getEndDate() == null
+ ||model.getProjectId() == null
+ ||model.getCompanyId() == null
+ ||model.getRoundedUp() == null
+ ||model.getRoomIds() == null
+ ||model.getRoomIds().size() == 0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鍚堝悓淇℃伅");
+ }
+ if(model.getEndDate().getTime()<= model.getStartDate().getTime()){
+
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+
+ if(model.getBillType() ==0 ){
+ //濡傛灉鐢熸垚绉熻祦鏉℃
+ if( model.getZlDeposit() == null
+ ||model.getZlPayType() == null
+ || model.getZlPayType()>3
+ || model.getZlPayType()<0
+ ||model.getZlDetailList()==null
+ ||model.getZlDetailList().size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅");
+ }
+ if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
+ (model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
+ ||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
+ ||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭璧佹潯娆惧厤绉熸湡淇℃伅锛�");
+ }
+ for(YwContractDetail d :model.getZlDetailList()){
+ if( d.getStartDate() == null
+ ||d.getEndDate() == null
+ ||d.getPrice() == null
+ ||d.getCircleType() == null
+ || d.getCircleType()>6
+ || d.getCircleType()<0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅!");
+ }
+ if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
+
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+ if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
+ Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ }
+ }
+ if(model.getBillType() == 1 ){
+ //濡傛灉鐢熸垚鐗╀笟鏉℃
+ if( model.getWyDeposit() == null
+ ||model.getWyPayType() == null
+ || model.getWyPayType()>3
+ || model.getWyPayType()<0
+ ||model.getWyDetailList()==null
+ ||model.getWyDetailList().size() ==0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅");
+ }
+ if(!(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()==null) && (
+ (model.getWyFreeEndDate()!=null && model.getWyFreeStartDate()==null)
+ ||(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()!=null)
+ ||model.getWyFreeEndDate().getTime()<= model.getWyFreeStartDate().getTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭墿涓氭潯娆惧厤绉熸湡淇℃伅锛�");
+ }
+ for(YwContractDetail d :model.getWyDetailList()){
+ if( d.getStartDate() == null
+ ||d.getEditDate() == null
+ ||d.getPrice() == null
+ ||d.getCircleType() == null
+ || d.getCircleType()>6
+ || d.getCircleType()<0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅!");
+ }
+ if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+ if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
+ Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ }
+ }
+
+ YwProject project = projectMapper.selectById(model.getCompanyId());
+ if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勯」鐩俊鎭紒");
+ }
+ List<YwRoom> rooms = roomMapper.selectList(new QueryWrapper<YwRoom>().lambda()
+ .eq(YwRoom::getIsdeleted,Constants.ZERO)
+ .in(YwRoom::getId,model.getRoomIds())
+ .eq(YwRoom::getProjectId,model.getProjectId()) );
+ if(rooms ==null || rooms.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨瀵瑰簲椤圭洰涓嬫纭殑鎴挎簮淇℃伅");
+ }
+ if(rooms.size() != rooms.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀛樺湪鏃犳晥鐨勬埧婧愪俊鎭紒");
+ }
+ model.setTotalArea(new BigDecimal(0));
+ for(YwRoom r : rooms){
+ model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
+ }
+ }
private String getRemarlByParam(YwContract model) {
@@ -106,12 +224,12 @@
}
str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getStartDate()))
.replace("{param2}",model.getTotalArea().intValue()+"")
- .replace("{param3}",getPayTypeByNum(model.getZlPayType()))
+ .replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
.replace("{param4}",zl!=null&&zl.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param5}",getPayTypeByNum(model.getWyPayType()))
- .replace("{param6}",getUnitTypeByNum(zl))
+ .replace("{param5}",Constants.getPayTypeByNum(model.getWyPayType()))
+ .replace("{param6}",Constants.getUnitTypeByNum(zl!=null?zl.getCircleType():null))
.replace("{param7}",zl!=null&&yw.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param8}",getUnitTypeByNum(yw));
+ .replace("{param8}",Constants.getUnitTypeByNum(yw!=null?yw.getCircleType():null));
return str;
}
private String getbackRentRemarkByParam(YwContract model) {
@@ -126,39 +244,6 @@
return str;
}
- private CharSequence getUnitTypeByNum(YwContractDetail zl) {
- if(zl==null){
- return "";
- }
- // 浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱
- int zlPayType = Constants.formatIntegerNum(zl.getCircleType());
- if(zlPayType == 1){
- return "鍏�/銕÷锋湀";
- }else if(zlPayType == 2){
- return "鍏�/銕÷峰ぉ";
- }else if(zlPayType == 3){
- return "鍏�/澶�";
- }else if(zlPayType == 4){
- return "鍏�/鏈�";
- }else if(zlPayType == 5){
- return "鍏�/骞�";
- }else if(zlPayType == 6){
- return "鍏�/鍦�";
- }
- return "鍏�/銕÷峰ぉ";
- }
-
- private CharSequence getPayTypeByNum(Integer zlPayType) {
- //绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
- if(zlPayType == 1){
- return "3涓湀涓�浠�";
- }else if(zlPayType == 2){
- return "6涓湀涓�浠�";
- }else if(zlPayType == 3){
- return "1骞翠竴浠�";
- }
- return "涓�娆℃�т粯娆�";
- }
/**
@@ -399,7 +484,9 @@
details.add(d);
}
}
- ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ if(model.getId()!=null){
+ ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
//澶勭悊璐﹀崟淇℃伅
dealBillListBiz(model,details);
}
@@ -410,26 +497,27 @@
* @param details
*/
private void dealBillListBiz(YwContract model, List<YwContractDetail> details) {
- List<YwContractBill> billList = new ArrayList<>();
+ List<YwContractBill> billList1 = new ArrayList<>();
+ List<YwContractBill> billList2 = new ArrayList<>();
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
|| Constants.equalsInteger(model.getType(),Constants.ONE)){
//濡傛灉鏈夌璧佹潯娆�
if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList.add(initDepoistBill(Constants.THREE,model));
+ billList1.add(initDepoistBill(Constants.THREE,model));
}
if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -437,27 +525,38 @@
//濡傛灉鐗╀笟鏉℃
if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList.add(initDepoistBill(Constants.FOUR,model));
+ billList2.add(initDepoistBill(Constants.FOUR,model));
}
if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}
}
- for(int i=0;i<billList.size();i++){
- billList.get(i).setSortnum(i+1);
- }
- ywContractBillMapper.insert(billList);
+ if(model.getBillType() == 0){
+ model.setBillList(billList1);
+ }else if(model.getBillType() == 0){
+ model.setBillList(billList2);
+ }
+ if(model.getId()!=null){
+ for(int i=0;i<billList1.size();i++){
+ billList1.get(i).setSortnum(i+1);
+ }
+ for(int i=0;i<billList2.size();i++){
+ billList2.get(i).setSortnum(i+1);
+ }
+ ywContractBillMapper.insert(billList1);
+ ywContractBillMapper.insert(billList2);
+ }
}
private YwContractBill initDepoistBill(int type, YwContract model) {
@@ -787,12 +886,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅!");
}
if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
-
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ if(model.getZlFirstCircle() == null){//棣栨湡淇℃伅
+ model.setZlFirstPrice(d.getPrice());
+ model.setZlFirstCircle(d.getCircleType());
}
}
}
@@ -829,6 +931,11 @@
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ if(model.getWyFirstCircle() == null){
+ //棣栨湡淇℃伅
+ model.setWyFirstPrice(d.getPrice());
+ model.setWyFirstCircle(d.getCircleType());
}
}
}
@@ -952,7 +1059,8 @@
.eq(YwRoom::getIsdeleted,Constants.ZERO)
.exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
-
+ model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
+ model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
//鏌ヨ绉熻硟鏉℃淇℃伅
MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
dw.selectAll(YwContractDetail.class )
@@ -1142,7 +1250,14 @@
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwContract::getStartDate, pageWrap.getModel().getQueryStartTime())
.le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwContract::getEndDate, pageWrap.getModel().getQueryEndTime());
queryWrapper.orderByDesc(YwContract::getCreateDate );
- return PageData.from(ywContractMapper.selectJoinPage(page, YwContract.class,queryWrapper));
+ PageData<YwContract> data = PageData.from(ywContractMapper.selectJoinPage(page, YwContract.class,queryWrapper));
+ if(data!=null && data.getRecords()!=null){
+ for(YwContract model : data.getRecords()){
+ model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
+ model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
+ }
+ }
+ return data;
}
@Override
--
Gitblit v1.9.3