From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
index d1d0c28..7c37664 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeCmd.java
@@ -212,50 +212,56 @@
private void freshFeeAttrs(List<ApiFeeDataVo> fees, List<FeeDto> feeDtos) {
String link = "";
+ //todo 褰卞搷鏌ヨ鎬ц兘 娉ㄩ噴 by wuxw
+// for (FeeDto feeDto : feeDtos) {
+// if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿
+// OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+// ownerRoomRelDto.setRoomId(feeDto.getPayerObjId());
+// List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+// if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) {
+// continue;
+// }
+// OwnerDto ownerDto = new OwnerDto();
+// ownerDto.setMemberId(ownerRoomRelDtos.get(0).getOwnerId());
+// List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+// Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富閿欒锛�");
+// link = ownerDtos.get(0).getLink();
+// } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
+// OwnerCarDto ownerCarDto = new OwnerCarDto();
+// ownerCarDto.setMemberId(feeDto.getPayerObjId());
+// List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+// Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締琛ㄩ敊璇紒");
+// OwnerDto ownerDto = new OwnerDto();
+// ownerDto.setMemberId(ownerCarDtos.get(0).getOwnerId());
+// List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+// Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富閿欒锛�");
+// link = ownerDtos.get(0).getLink();
+// }
+// FeeAttrDto feeAttrDto = new FeeAttrDto();
+// feeAttrDto.setFeeId(feeDto.getFeeId());
+// List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
+// if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+// continue;
+// }
+// for (FeeAttrDto feeAttr : feeAttrDtos) {
+// if (!FeeAttrDto.SPEC_CD_OWNER_LINK.equals(feeAttr.getSpecCd())) { //鑱旂郴鏂瑰紡
+// continue;
+// }
+// if (feeAttr.getValue().equals(link)) {
+// continue;
+// }
+// FeeAttrPo feeAttrPo = new FeeAttrPo();
+// feeAttrPo.setAttrId(feeAttr.getAttrId());
+// feeAttrPo.setValue(link);
+// int flag = feeAttrInnerServiceSMOImpl.updateFeeAttr(feeAttrPo);
+// if (flag < 1) {
+// throw new CmdException("鏇存柊涓氫富鑱旂郴鏂瑰紡澶辫触");
+// }
+//
+// }
+// }
for (ApiFeeDataVo apiFeeDataVo : fees) {
for (FeeDto feeDto : feeDtos) {
- if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(feeDto.getPayerObjId());
- List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() == 1) {
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(ownerRoomRelDtos.get(0).getOwnerId());
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富閿欒锛�");
- link = ownerDtos.get(0).getLink();
- } else {
- continue;
- }
- } else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setMemberId(feeDto.getPayerObjId());
- List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締琛ㄩ敊璇紒");
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(ownerCarDtos.get(0).getOwnerId());
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富閿欒锛�");
- link = ownerDtos.get(0).getLink();
- }
- FeeAttrDto feeAttrDto = new FeeAttrDto();
- feeAttrDto.setFeeId(feeDto.getFeeId());
- List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
- if (feeAttrDtos != null || feeAttrDtos.size() > 0) {
- for (FeeAttrDto feeAttr : feeAttrDtos) {
- if (!StringUtil.isEmpty(feeAttr.getSpecCd()) && feeAttr.getSpecCd().equals("390009")) { //鑱旂郴鏂瑰紡
- if (!feeAttr.getValue().equals(link)) {
- FeeAttrPo feeAttrPo = new FeeAttrPo();
- feeAttrPo.setAttrId(feeAttr.getAttrId());
- feeAttrPo.setValue(link);
- int flag = feeAttrInnerServiceSMOImpl.updateFeeAttr(feeAttrPo);
- if (flag < 1) {
- throw new CmdException("鏇存柊涓氫富鑱旂郴鏂瑰紡澶辫触");
- }
- }
- }
- }
- }
if (apiFeeDataVo.getFeeId().equals(feeDto.getFeeId())) {
apiFeeDataVo.setFeeAttrs(feeDto.getFeeAttrDtos());
}
@@ -375,7 +381,6 @@
computeFeeSMOImpl.dealRentRate(feeDto);
}
-
/**
--
Gitblit v1.8.0