From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java
index b174cb1..fbd3a90 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java
@@ -1,12 +1,12 @@
package com.java110.fee.bmo.payFeeAudit.impl;
import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.order.BusinessDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.owner.OwnerCarDto;
-import com.java110.dto.payFeeAudit.PayFeeAuditDto;
+import com.java110.dto.payFee.PayFeeAuditDto;
import com.java110.fee.bmo.payFeeAudit.IGetPayFeeAuditBMO;
import com.java110.intf.fee.IPayFeeAuditInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -46,33 +46,24 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public ResponseEntity<String> get(PayFeeAuditDto payFeeAuditDto) {
-
if (!refreshRoomPayObjId(payFeeAuditDto)) {
ResponseEntity<String> responseEntity = new ResponseEntity<String>("[]", HttpStatus.OK);
return responseEntity;
}
-
if (!refreshCarPayObjId(payFeeAuditDto)) {
ResponseEntity<String> responseEntity = new ResponseEntity<String>("[]", HttpStatus.OK);
return responseEntity;
}
-
-
int count = payFeeAuditInnerServiceSMOImpl.queryPayFeeAuditsCount(payFeeAuditDto);
-
List<PayFeeAuditDto> payFeeAuditDtos = null;
if (count > 0) {
payFeeAuditDtos = payFeeAuditInnerServiceSMOImpl.queryPayFeeAudits(payFeeAuditDto);
-
frashRoomAndStaff(payFeeAuditDtos);
} else {
payFeeAuditDtos = new ArrayList<>();
}
-
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) payFeeAuditDto.getRow()), count, payFeeAuditDtos);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
return responseEntity;
}
@@ -162,7 +153,7 @@
for (PayFeeAuditDto payFeeAuditDto : payFeeAuditDtos) {
for (OrderDto orderDto : orderDtos) {
- if(StringUtil.isEmpty(payFeeAuditDto.getbId())){
+ if (StringUtil.isEmpty(payFeeAuditDto.getbId())) {
continue;
}
if (payFeeAuditDto.getbId().equals(orderDto.getbId())) {
@@ -171,8 +162,6 @@
}
}
}
-
-
}
}
--
Gitblit v1.8.0