From 559ea09c972ed7491ef35fedf673aee65ce03fd7 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 16 四月 2021 12:28:13 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
index a379ca3..8089390 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java
@@ -6,6 +6,7 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.fee.bmo.payFeeDetail.IImportPayFeeBMODetail;
import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
@@ -13,6 +14,7 @@
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.StatusConstant;
@@ -46,6 +48,9 @@
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
/**
* @param reqJson
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -57,6 +62,7 @@
String communityId = reqJson.getString("communityId");
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
+ String objType = reqJson.getString("objType");
JSONArray datas = reqJson.getJSONArray("importRoomFees");
@@ -71,8 +77,11 @@
if (importRoomFees.size() < 1) {
return ResultVo.success();
}
-
- importFeeDetails(storeId, userId, importRoomFees);
+ if(FeeDto.PAYER_OBJ_TYPE_ROOM.equals(objType)) {
+ importFeeDetails(storeId, userId, importRoomFees);
+ }else{
+ importCarFeeDetails(storeId, userId, importRoomFees);
+ }
return ResultVo.success();
}
@@ -80,12 +89,76 @@
private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees) {
importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
-
for (ImportRoomFee importRoomFee : importRoomFees) {
importFeeDetail(importRoomFee, storeId, userId);
}
}
+
+ private void importCarFeeDetails(String storeId, String userId, List<ImportRoomFee> importCarFees) {
+
+ importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
+ for (ImportRoomFee importCarFee : importCarFees) {
+ importCarFeeDetail(importCarFee, storeId, userId);
+ }
+ }
+
+ /**
+ * 瀵煎叆 璐圭敤鍘嗗彶
+ *
+ * @param importRoomFee
+ */
+ private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId) {
+
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeName(importRoomFee.getFeeName());
+ feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯");
+
+ FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
+
+ FeeDto feeDto = new FeeDto();
+ feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
+ feeDto.setCommunityId(importRoomFee.getCommunityId());
+ feeDto.setPayerObjId(importRoomFee.getCarId());
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ List<PayFeePo> payFeePos = null;
+ if (feeDtos == null || feeDtos.size() < 1) {
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setCommunityId(importRoomFee.getCommunityId());
+ payFeePo.setConfigId(feeDto.getConfigId());
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ payFeePo.setStartTime(importRoomFee.getStartTime());
+ payFeePo.setEndTime(importRoomFee.getEndTime());
+ payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
+ payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
+ payFeePo.setIncomeObjId(storeId);
+ payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setPayerObjId(importRoomFee.getCarId());
+ payFeePo.setUserId(userId);
+ payFeePo.setCreateTime(importRoomFee.getCreateTime());
+ payFeePos = new ArrayList<>();
+ payFeePos.add(payFeePo);
+ feeInnerServiceSMOImpl.saveFee(payFeePos);
+ feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ }
+
+ for (FeeDto tmpFeeDto : feeDtos) {
+ try {
+ doImportFeeDetail(tmpFeeDto, importRoomFee);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
/**
* 瀵煎叆 璐圭敤鍘嗗彶
*
--
Gitblit v1.8.0