From 4145c533ebfcd4e5da503526170e7eeeb4c9dace Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 七月 2022 17:17:02 +0800
Subject: [PATCH] 8.费用--欠费信息中，导出功能中，多导出了一条金额为零的数据，但是列表中是不存在的
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 472 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 460 insertions(+), 12 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
old mode 100644
new mode 100755
index e8fc3e8..38231f4
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java
@@ -8,11 +8,19 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.importFee.ImportFeeDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.fee.bmo.IImportRoomFee;
import com.java110.fee.listener.fee.UpdateFeeInfoListener;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.*;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IImportFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
@@ -24,7 +32,7 @@
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -66,6 +74,12 @@
@Autowired
private IImportFeeInnerServiceSMO importFeeInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
/**
* 娆犺垂缂磋垂
*
@@ -85,10 +99,30 @@
String feeTypeCd = reqJson.getString("feeTypeCd");//璐圭敤澶х被
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
+ String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
+
+
+ JSONArray importRoomFees = reqJson.getJSONArray("importRoomFees");
+
+ List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
+
+ if (tmpImportRoomFees == null || tmpImportRoomFees.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚鍏ヨ垂鐢�");
+ }
+
+ if (StringUtil.isEmpty(feeName)) {
+ feeName = tmpImportRoomFees.get(0).getFeeName();
+ }
+
+ if (StringUtil.isEmpty(feeName)) {
+ feeName = IMPORT_FEE_NAME;
+ }
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeTypeCd(feeTypeCd);
- feeConfigDto.setFeeName(IMPORT_FEE_NAME);
+ feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
feeConfigDto.setCommunityId(communityId);
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
// 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
@@ -100,11 +134,6 @@
feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
}
-
- JSONArray importRoomFees = reqJson.getJSONArray("importRoomFees");
-
- List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
-
for (ImportRoomFee tmpImportRoomFee : tmpImportRoomFees) {
tmpImportRoomFee.setCommunityId(communityId);
}
@@ -112,6 +141,27 @@
Assert.isNotNull(tmpImportRoomFees, "鍙傛暟閿欒锛屾湭鍖呭惈澶勭悊璐圭敤");
tmpImportRoomFees = roomInnerServiceSMOImpl.freshRoomIds(tmpImportRoomFees);
+
+ List<String> roomIds = new ArrayList<>();
+ for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
+ roomIds.add(importRoomFee.getRoomId());
+ }
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setCommunityId(tmpImportRoomFees.get(0).getCommunityId());
+ ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
+ for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
+ if(StringUtil.isEmpty(importRoomFee.getRoomId())){
+ throw new IllegalArgumentException("鎴垮眿涓嶅瓨鍦紝"+importRoomFee.getFloorNum()+"-"+importRoomFee.getUnitNum()+"-"+importRoomFee.getRoomNum());
+ }
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ if (importRoomFee.getRoomId().equals(tmpOwnerDto.getRoomId())) {
+ importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
+ importRoomFee.setOwnerName(tmpOwnerDto.getName());
+ importRoomFee.setOwnerLink(tmpOwnerDto.getLink());
+ }
+ }
+ }
List<PayFeePo> payFeePos = new ArrayList<>();
List<FeeAttrPo> feeAttrPos = new ArrayList<>();
@@ -140,6 +190,7 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setBatchId(batchId);
//payFeePo.setStartTime(importRoomFee.getStartTime());
payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -152,6 +203,42 @@
feeAttrPo.setValue(importRoomFee.getFeeName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ feeAttrPo.setValue(importRoomFee.getEndTime());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+
+ if (!StringUtil.isEmpty(importRoomFee.getOwnerId())) {
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+ feeAttrPo.setValue(importRoomFee.getOwnerId());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+ feeAttrPo.setValue(importRoomFee.getOwnerName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+ feeAttrPo.setValue(importRoomFee.getOwnerLink());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+ }
+
importFeeDetailPo = new ImportFeeDetailPo();
importFeeDetailPo.setAmount(importRoomFee.getAmount());
importFeeDetailPo.setCommunityId(communityId);
@@ -162,8 +249,369 @@
importFeeDetailPo.setUnitNum(importRoomFee.getUnitNum());
importFeeDetailPo.setRoomNum(importRoomFee.getRoomNum());
importFeeDetailPo.setRoomId(importRoomFee.getRoomId());
+ importFeeDetailPo.setObjId(importRoomFee.getRoomId());
+ importFeeDetailPo.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ importFeeDetailPo.setObjName(!"0".equals(importRoomFee.getUnitNum())
+ ? importRoomFee.getFloorNum() + "鏍�" + importRoomFee.getUnitNum() + "鍗曞厓" + importRoomFee.getRoomNum() + "瀹�" :
+ importRoomFee.getFloorNum() + "鏍�" + importRoomFee.getRoomNum() + "瀹�"
+ );
importFeeDetailPo.setStartTime(importRoomFee.getStartTime());
- importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_IfdId));
+ importFeeDetailPo.setState("1000");
+ importFeeDetailPo.setImportFeeId(importFeeId);
+ importFeeDetailPos.add(importFeeDetailPo);
+ }
+
+ feeInnerServiceSMOImpl.saveFee(payFeePos);
+
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+
+ ImportFeeDto importFeeDto = new ImportFeeDto();
+ importFeeDto.setCommunityId(communityId);
+ importFeeDto.setImportFeeId(importFeeId);
+
+ List<ImportFeeDto> importRoomFeess = importFeeInnerServiceSMOImpl.queryImportFees(importFeeDto);
+
+ if (importRoomFeess == null || importRoomFeess.size() < 1) {
+ //淇濆瓨鏃ュ織
+ ImportFeePo importFeePo = new ImportFeePo();
+ importFeePo.setCommunityId(communityId);
+ importFeePo.setFeeTypeCd(feeTypeCd);
+ importFeePo.setImportFeeId(importFeeId);
+ importFeeInnerServiceSMOImpl.saveImportFee(importFeePo);
+ }
+
+
+ importFeeDetailInnerServiceSMOImpl.saveImportFeeDetails(importFeeDetailPos);
+
+
+ JSONObject data = new JSONObject();
+ data.put("successCount", successCount);
+ data.put("errorCount", errorCount);
+
+ return ResultVo.createResponseEntity(data);
+ }
+
+ /**
+ * 杞﹁締璐圭敤瀵煎叆
+ *
+ * @param reqJson
+ * @return
+ */
+ @Override
+ @Java110Transactional
+ public ResponseEntity<String> importCarFee(JSONObject reqJson) {
+
+ int successCount = 0;
+ int errorCount = 0;
+
+ //灏忓尯ID
+ String communityId = reqJson.getString("communityId");
+ String importFeeId = reqJson.getString("importFeeId");
+ String feeTypeCd = reqJson.getString("feeTypeCd");//璐圭敤澶х被
+ String storeId = reqJson.getString("storeId");
+ String userId = reqJson.getString("userId");
+ String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
+
+ if (StringUtil.isEmpty(feeName)) {
+ feeName = IMPORT_FEE_NAME;
+ }
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeTypeCd(feeTypeCd);
+ feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
+ feeConfigDto.setCommunityId(communityId);
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ // 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
+ if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ //鐢熸垚瀵煎叆璐�
+ feeConfigDto.setConfigId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+ saveFeeConfig(feeConfigDto);
+ } else {
+ feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
+ }
+
+
+ JSONArray importCarFees = reqJson.getJSONArray("importCarFees");
+
+ List<ImportRoomFee> tmpImportCarFees = importCarFees.toJavaList(ImportRoomFee.class);
+
+ for (ImportRoomFee tmpImportCarFee : tmpImportCarFees) {
+ tmpImportCarFee.setCommunityId(communityId);
+ }
+
+ Assert.isNotNull(tmpImportCarFees, "鍙傛暟閿欒锛屾湭鍖呭惈澶勭悊璐圭敤");
+
+ tmpImportCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(tmpImportCarFees);
+
+ List<PayFeePo> payFeePos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+ List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
+ PayFeePo payFeePo = null;
+ ImportFeeDetailPo importFeeDetailPo = null;
+ for (ImportRoomFee importCarFee : tmpImportCarFees) {
+ if (StringUtil.isEmpty(importCarFee.getCarId()) || importCarFee.getCarId().startsWith("-") ||
+ StringUtil.isEmpty(importCarFee.getCarNum()) || importCarFee.getCarNum().startsWith("-")
+ ) {
+ errorCount++;
+ continue;
+ }
+ successCount++;
+ payFeePo = new PayFeePo();
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setEndTime(importCarFee.getStartTime());
+ payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setCommunityId(communityId);
+ payFeePo.setConfigId(feeConfigDto.getConfigId());
+ payFeePo.setPayerObjId(importCarFee.getCarId());
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ payFeePo.setUserId(userId);
+ payFeePo.setIncomeObjId(storeId);
+ payFeePo.setFeeTypeCd(feeTypeCd);
+ payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+ payFeePo.setAmount(importCarFee.getAmount());
+ payFeePo.setBatchId(batchId);
+ //payFeePo.setStartTime(importRoomFee.getStartTime());
+ payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+
+ payFeePos.add(payFeePo);
+
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
+ feeAttrPo.setValue(importCarFee.getFeeName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ feeAttrPo.setValue(importCarFee.getEndTime());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+
+ if (!StringUtil.isEmpty(importCarFee.getOwnerId())) {
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+ feeAttrPo.setValue(importCarFee.getOwnerId());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+ feeAttrPo.setValue(importCarFee.getOwnerName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+ feeAttrPo.setValue(importCarFee.getOwnerLink());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+ }
+
+ importFeeDetailPo = new ImportFeeDetailPo();
+ importFeeDetailPo.setAmount(importCarFee.getAmount());
+ importFeeDetailPo.setCommunityId(communityId);
+ importFeeDetailPo.setEndTime(importCarFee.getEndTime());
+ importFeeDetailPo.setFeeId(payFeePo.getFeeId());
+ importFeeDetailPo.setFeeName(importCarFee.getFeeName());
+ importFeeDetailPo.setFloorNum("-");
+ importFeeDetailPo.setUnitNum("-");
+ importFeeDetailPo.setRoomNum("-");
+ importFeeDetailPo.setRoomId("-");
+ importFeeDetailPo.setObjId(importCarFee.getCarId());
+ importFeeDetailPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ importFeeDetailPo.setObjName(importCarFee.getCarNum());
+ importFeeDetailPo.setStartTime(importCarFee.getStartTime());
+ importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_IfdId));
+ importFeeDetailPo.setState("1000");
+ importFeeDetailPo.setImportFeeId(importFeeId);
+ importFeeDetailPos.add(importFeeDetailPo);
+ }
+
+ feeInnerServiceSMOImpl.saveFee(payFeePos);
+
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+
+ ImportFeeDto importFeeDto = new ImportFeeDto();
+ importFeeDto.setCommunityId(communityId);
+ importFeeDto.setImportFeeId(importFeeId);
+
+ List<ImportFeeDto> importRoomFeess = importFeeInnerServiceSMOImpl.queryImportFees(importFeeDto);
+
+ if (importRoomFeess == null || importRoomFeess.size() < 1) {
+ //淇濆瓨鏃ュ織
+ ImportFeePo importFeePo = new ImportFeePo();
+ importFeePo.setCommunityId(communityId);
+ importFeePo.setFeeTypeCd(feeTypeCd);
+ importFeePo.setImportFeeId(importFeeId);
+ importFeeInnerServiceSMOImpl.saveImportFee(importFeePo);
+ }
+
+
+ importFeeDetailInnerServiceSMOImpl.saveImportFeeDetails(importFeeDetailPos);
+
+
+ JSONObject data = new JSONObject();
+ data.put("successCount", successCount);
+ data.put("errorCount", errorCount);
+
+ return ResultVo.createResponseEntity(data);
+ }
+
+ /**
+ * 鍚堝悓璐圭敤瀵煎叆
+ *
+ * @param reqJson
+ * @return
+ */
+ @Override
+ @Java110Transactional
+ public ResponseEntity<String> importContractFees(JSONObject reqJson) {
+
+ int successCount = 0;
+ int errorCount = 0;
+
+ //灏忓尯ID
+ String communityId = reqJson.getString("communityId");
+ String importFeeId = reqJson.getString("importFeeId");
+ String feeTypeCd = reqJson.getString("feeTypeCd");//璐圭敤澶х被
+ String storeId = reqJson.getString("storeId");
+ String userId = reqJson.getString("userId");
+ String feeName = reqJson.getString("feeName");
+ String batchId = reqJson.getString("batchId");
+
+ if (StringUtil.isEmpty(feeName)) {
+ feeName = IMPORT_FEE_NAME;
+ }
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeTypeCd(feeTypeCd);
+ feeConfigDto.setFeeName(feeName);
+ feeConfigDto.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
+ feeConfigDto.setCommunityId(communityId);
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ // 鏍规嵁璐圭敤澶х被 鍒ゆ柇鏄惁鏈夊瓨鍦� 璐圭敤瀵煎叆鏀跺叆椤�
+ if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ //鐢熸垚瀵煎叆璐�
+ feeConfigDto.setConfigId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+ saveFeeConfig(feeConfigDto);
+ } else {
+ feeConfigDto.setConfigId(feeConfigDtos.get(0).getConfigId());
+ }
+
+
+ JSONArray importCarFees = reqJson.getJSONArray("importRoomFees");
+
+ List<ImportRoomFee> tmpImportContractFees = importCarFees.toJavaList(ImportRoomFee.class);
+
+ for (ImportRoomFee tmpImportCarFee : tmpImportContractFees) {
+ tmpImportCarFee.setCommunityId(communityId);
+ }
+
+ Assert.isNotNull(tmpImportContractFees, "鍙傛暟閿欒锛屾湭鍖呭惈澶勭悊璐圭敤");
+
+ List<PayFeePo> payFeePos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+ List<ImportFeeDetailPo> importFeeDetailPos = new ArrayList<>();
+ PayFeePo payFeePo = null;
+ ImportFeeDetailPo importFeeDetailPo = null;
+ for (ImportRoomFee importCarFee : tmpImportContractFees) {
+ if (StringUtil.isEmpty(importCarFee.getContractId()) || importCarFee.getContractId().startsWith("-")
+ ) {
+ errorCount++;
+ continue;
+ }
+ successCount++;
+ payFeePo = new PayFeePo();
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setEndTime(importCarFee.getStartTime());
+ payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setCommunityId(communityId);
+ payFeePo.setConfigId(feeConfigDto.getConfigId());
+ payFeePo.setPayerObjId(importCarFee.getContractId());
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+ payFeePo.setUserId(userId);
+ payFeePo.setIncomeObjId(storeId);
+ payFeePo.setFeeTypeCd(feeTypeCd);
+ payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+ payFeePo.setAmount(importCarFee.getAmount());
+ payFeePo.setStartTime(importCarFee.getStartTime());
+ payFeePo.setBatchId(batchId);
+ //payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+
+ payFeePos.add(payFeePo);
+
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
+ feeAttrPo.setValue(importCarFee.getFeeName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+ feeAttrPo.setValue(importCarFee.getEndTime());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+
+ if (!StringUtil.isEmpty(importCarFee.getOwnerId())) {
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+ feeAttrPo.setValue(importCarFee.getOwnerId());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+ feeAttrPo.setValue(importCarFee.getOwnerName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+ feeAttrPo.setValue(importCarFee.getOwnerLink());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+ }
+
+ importFeeDetailPo = new ImportFeeDetailPo();
+ importFeeDetailPo.setAmount(importCarFee.getAmount());
+ importFeeDetailPo.setCommunityId(communityId);
+ importFeeDetailPo.setEndTime(importCarFee.getEndTime());
+ importFeeDetailPo.setFeeId(payFeePo.getFeeId());
+ importFeeDetailPo.setFeeName(importCarFee.getFeeName());
+ importFeeDetailPo.setFloorNum("-");
+ importFeeDetailPo.setUnitNum("-");
+ importFeeDetailPo.setRoomNum("-");
+ importFeeDetailPo.setRoomId("-");
+ importFeeDetailPo.setObjId(importCarFee.getContractId());
+ importFeeDetailPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+ importFeeDetailPo.setObjName("鍚堝悓");
+ importFeeDetailPo.setStartTime(importCarFee.getStartTime());
+ importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_IfdId));
importFeeDetailPo.setState("1000");
importFeeDetailPo.setImportFeeId(importFeeId);
importFeeDetailPos.add(importFeeDetailPo);
@@ -209,12 +657,12 @@
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(feeConfigDto, PayFeeConfigPo.class);
payFeeConfigPo.setAdditionalAmount("0");
payFeeConfigPo.setBillType(FeeConfigDto.BILL_TYPE_MONTH);
- payFeeConfigPo.setComputingFormula("4004");
+ payFeeConfigPo.setComputingFormula(FeeConfigDto.COMPUTING_FORMULA_DYNAMIC);
payFeeConfigPo.setEndTime(DateUtil.getLastTime());
payFeeConfigPo.setFeeFlag("2006012");
- payFeeConfigPo.setIsDefault("T");
+ payFeeConfigPo.setIsDefault("F");
payFeeConfigPo.setPaymentCd("2100");
- payFeeConfigPo.setFeeName(IMPORT_FEE_NAME);
+ payFeeConfigPo.setFeeName(feeConfigDto.getFeeName());
payFeeConfigPo.setSquarePrice("0");
payFeeConfigPo.setPaymentCycle("1");
payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
--
Gitblit v1.8.0