From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-acct/src/main/java/com/java110/acct/api/AccountApi.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
index eae38e6..2df6b46 100644
--- a/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
+++ b/service-acct/src/main/java/com/java110/acct/api/AccountApi.java
@@ -3,15 +3,23 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.acct.bmo.account.IGetAccountBMO;
import com.java110.acct.bmo.account.IOwnerPrestoreAccountBMO;
-import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.account.AccountDto;
import com.java110.dto.accountDetail.AccountDetailDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @ClassName AccountApi
@@ -31,6 +39,15 @@
@Autowired
private IOwnerPrestoreAccountBMO ownerPrestoreAccountBMOImpl;
+
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
@@ -62,25 +79,55 @@
@RequestMapping(value = "/queryOwnerAccount", method = RequestMethod.GET)
public ResponseEntity<String> queryOwnerAccount(
@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "ownerId",required = false) String ownerId,
- @RequestParam(value = "ownerName",required = false) String ownerName,
- @RequestParam(value = "tel",required = false) String tel,
- @RequestParam(value = "idCard",required = false) String idCard,
+ @RequestParam(value = "ownerId", required = false) String ownerId,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "link", required = false) String link,
+ @RequestParam(value = "idCard", required = false) String idCard,
+ @RequestParam(value = "acctType", required = false) String acctType,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
AccountDto accountDto = new AccountDto();
accountDto.setPage(page);
accountDto.setRow(row);
- accountDto.setObjId(ownerId);
+ if (!StringUtil.isEmpty(feeId)) {
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(feeId);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ Assert.listOnlyOne(feeDtos, "鏌ヨ璐圭敤淇℃伅閿欒锛�");
+ //鑾峰彇浠樿垂瀵硅薄绫诲瀷(3333 鎴垮眿 6666 鏄溅浣�)
+ String payerObjType = feeDtos.get(0).getPayerObjType();
+ //鑾峰彇浠樿垂瀵硅薄id
+ String payerObjId = feeDtos.get(0).getPayerObjId();
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(payerObjType)) { //鎴垮眿
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(payerObjId);
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ Assert.listOnlyOne(ownerRoomRelDtos, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
+ ownerId = ownerRoomRelDtos.get(0).getOwnerId();
+ } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(payerObjType)) {
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCarId(payerObjId);
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+// Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締鍏崇郴琛ㄩ敊璇紒");
+ ownerId = ownerCarDtos.get(0).getOwnerId();
+ } else {
+ ownerId = "-1";
+ }
+ accountDto.setObjId(ownerId);
+ } else {
+ accountDto.setObjId(ownerId);
+ }
accountDto.setObjType(AccountDto.OBJ_TYPE_PERSON);
accountDto.setAcctName(ownerName);
accountDto.setPartId(communityId);
+ accountDto.setAcctType(acctType);
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerId(ownerId);
ownerDto.setCommunityId(communityId);
- ownerDto.setLink(tel);
+ ownerDto.setLink(link);
ownerDto.setIdCard(idCard);
- return getAccountBMOImpl.queryOwnerAccount(accountDto,ownerDto);
+ return getAccountBMOImpl.queryOwnerAccount(accountDto, ownerDto);
}
/**
@@ -93,9 +140,9 @@
*/
@RequestMapping(value = "/queryOwnerAccountDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryOwnerAccountDetail(@RequestParam(value = "objId", required = false) String objId,
- @RequestParam(value = "acctId", required = false) String acctId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "acctId", required = false) String acctId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
AccountDetailDto accountDto = new AccountDetailDto();
accountDto.setPage(page);
accountDto.setRow(row);
@@ -115,6 +162,8 @@
@RequestMapping(value = "/queryAccountDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryAccountDetail(@RequestHeader(value = "store-id", required = false) String storeId,
@RequestParam(value = "acctId", required = false) String acctId,
+ @RequestParam(value = "detailType", required = false) String detailType,
+ @RequestParam(value = "orderId", required = false) String orderId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
AccountDetailDto accountDto = new AccountDetailDto();
@@ -122,6 +171,8 @@
accountDto.setRow(row);
accountDto.setObjId(storeId);
accountDto.setAcctId(acctId);
+ accountDto.setDetailType(detailType);
+ accountDto.setOrderId(orderId);
return getAccountBMOImpl.getDetail(accountDto);
}
@@ -138,11 +189,11 @@
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "ownerId", "涓氫富涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "amount", "閲戦涓嶈兘涓虹┖");
-
+ Assert.hasKeyAndValue(reqJson, "acctType", "璐︽埛绫诲瀷涓嶈兘涓虹┖");
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setRemark(reqJson.getString("remark"));
accountDetailPo.setObjId(reqJson.getString("ownerId"));
accountDetailPo.setAmount(reqJson.getString("amount"));
- return ownerPrestoreAccountBMOImpl.prestore(accountDetailPo,reqJson);
+ return ownerPrestoreAccountBMOImpl.prestore(accountDetailPo, reqJson);
}
}
--
Gitblit v1.8.0