From 5f83dbf4942e7f2e67963ae4ece013c22f091b72 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 09:18:26 +0800
Subject: [PATCH] 优化物品
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java | 20 ++++++--------------
1 files changed, 6 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
old mode 100644
new mode 100755
index d6dbfa7..fbd3a90
--- 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,14 +1,14 @@
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.IPayFeeAuditInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeAuditInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.order.IOrderInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
@@ -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,14 +153,15 @@
for (PayFeeAuditDto payFeeAuditDto : payFeeAuditDtos) {
for (OrderDto orderDto : orderDtos) {
+ if (StringUtil.isEmpty(payFeeAuditDto.getbId())) {
+ continue;
+ }
if (payFeeAuditDto.getbId().equals(orderDto.getbId())) {
payFeeAuditDto.setUserId(orderDto.getUserId());
payFeeAuditDto.setUserName(orderDto.getUserName());
}
}
}
-
-
}
}
--
Gitblit v1.8.0