From 4e992596dd378bb68021875a90801b4c7ecaf288 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 06 十二月 2024 00:52:07 +0800
Subject: [PATCH] 扣款只扣物业费和水电费扣款
---
service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
index b2be937..a710af4 100755
--- a/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/owner/impl/ComprehensiveQueryImpl.java
@@ -24,6 +24,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -105,20 +106,27 @@
break;
}
- if(ownerDto == null){
+ if (ownerDto == null) {
return ResultVo.createResponseEntity(1, 1, ownerDto);
}
//todo 鏌ヨ璐︽埛浣欓
AccountDto accountDto = new AccountDto();
accountDto.setObjId(ownerDto.getMemberId());
accountDto.setPartId(communityId);
- accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH);
- List<AccountDto> accountDtos =accountInnerServiceSMOImpl.queryAccounts(accountDto);
- if(!ListUtil.isNull(accountDtos)){
- ownerDto.setAcctAmount(accountDtos.get(0).getAmount());
+ List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+ if (ListUtil.isNull(accountDtos)) {
+ return ResultVo.createResponseEntity(1, 1, ownerDto);
}
+ BigDecimal accountDec = new BigDecimal("0");
+ for (AccountDto tmpAccountDto : accountDtos) {
+ accountDec = accountDec.add(new BigDecimal(tmpAccountDto.getAmount()));
+ }
+ accountDec = accountDec.setScale(2, BigDecimal.ROUND_HALF_UP);
+
+ ownerDto.setAcctAmount(accountDec.doubleValue() + "");
return ResultVo.createResponseEntity(1, 1, ownerDto);
+
}
/**
@@ -199,7 +207,7 @@
ownerDto.setName(searchValue);
ownerDto.setOwnerTypeCds(new String[]{OwnerDto.OWNER_TYPE_CD_MEMBER});
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
- Assert.isNotNull(ownerDtos,"鏈壘鍒版垚鍛樹俊鎭紝璇锋崲鍏朵粬鏉′欢鏌ヨ");
+ Assert.isNotNull(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭紝璇锋崲鍏朵粬鏉′欢鏌ヨ");
//Assert.listOnlyOne(ownerDtos, "鏈壘鍒版垚鍛樹俊鎭垨鑰呮煡璇㈠埌澶氭潯锛岃鎹㈠叾浠栨潯浠舵煡璇�");
OwnerDto owner = queryByOwnerId(communityId, ownerDtos.get(0).getOwnerId());
//鏌ヨ鏄惁鏈夎劚鏁忔潈闄�
@@ -470,7 +478,7 @@
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍟嗛摵 濡� 1-1");
}
- String[] values = searchValue.split("-",3);
+ String[] values = searchValue.split("-", 3);
if (values.length != 2) {
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍟嗛摵 濡� 1-1");
@@ -530,7 +538,7 @@
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍗曞厓-鎴垮眿 濡� 1-1-1");
}
- String[] values = searchValue.split("-",3);
+ String[] values = searchValue.split("-", 3);
if (values.length != 3) {
throw new IllegalArgumentException("鏌ヨ鍐呭鏍煎紡閿欒锛岃杈撳叆 妤兼爧-鍗曞厓-鎴垮眿 濡� 1-1-1");
@@ -544,7 +552,7 @@
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
//Assert.listOnlyOne(roomDtos, "鏈壘鍒版埧灞嬩俊鎭�");
- if(roomDtos == null || roomDtos.size() < 1){
+ if (roomDtos == null || roomDtos.size() < 1) {
throw new IllegalArgumentException("鏈壘鍒版埧灞嬩俊鎭�");
}
@@ -554,7 +562,7 @@
ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
//Assert.listOnlyOne(ownerDtos, "鏈壘鍒颁笟涓讳俊鎭�");
- if(ownerDtos == null || ownerDtos.size() < 1){
+ if (ownerDtos == null || ownerDtos.size() < 1) {
throw new IllegalArgumentException("鏈壘鍒颁笟涓讳俊鎭�");
}
--
Gitblit v1.8.0