From 769b8d3dbcf3d65dc94c7ac631fb65da56afefc4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 30 十二月 2020 23:08:38 +0800
Subject: [PATCH] 优化停车费导入功能
---
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java | 200 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 188 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
index 9126108..b226a12 100644
--- 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
@@ -7,12 +7,18 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.importFee.ImportFeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.fee.bmo.IImportRoomFee;
import com.java110.fee.listener.fee.UpdateFeeInfoListener;
-import com.java110.intf.IImportFeeDetailInnerServiceSMO;
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.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
@@ -21,6 +27,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,6 +72,9 @@
@Autowired
private IImportFeeInnerServiceSMO importFeeInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
/**
* 娆犺垂缂磋垂
*
@@ -74,6 +84,9 @@
@Override
@Java110Transactional
public ResponseEntity<String> importFee(JSONObject reqJson) {
+
+ int successCount = 0;
+ int errorCount = 0;
//灏忓尯ID
String communityId = reqJson.getString("communityId");
@@ -101,6 +114,10 @@
List<ImportRoomFee> tmpImportRoomFees = importRoomFees.toJavaList(ImportRoomFee.class);
+ for (ImportRoomFee tmpImportRoomFee : tmpImportRoomFees) {
+ tmpImportRoomFee.setCommunityId(communityId);
+ }
+
Assert.isNotNull(tmpImportRoomFees, "鍙傛暟閿欒锛屾湭鍖呭惈澶勭悊璐圭敤");
tmpImportRoomFees = roomInnerServiceSMOImpl.freshRoomIds(tmpImportRoomFees);
@@ -111,9 +128,17 @@
PayFeePo payFeePo = null;
ImportFeeDetailPo importFeeDetailPo = null;
for (ImportRoomFee importRoomFee : tmpImportRoomFees) {
+ if (StringUtil.isEmpty(importRoomFee.getRoomId()) || importRoomFee.getRoomId().startsWith("-") ||
+ StringUtil.isEmpty(importRoomFee.getFloorNum()) || importRoomFee.getFloorNum().startsWith("-") ||
+ StringUtil.isEmpty(importRoomFee.getUnitNum()) || importRoomFee.getUnitNum().startsWith("-")
+ ) {
+ errorCount++;
+ continue;
+ }
+ successCount++;
payFeePo = new PayFeePo();
payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
- payFeePo.setEndTime(importRoomFee.getEndTime());
+ payFeePo.setEndTime(importRoomFee.getStartTime());
payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setCommunityId(communityId);
payFeePo.setConfigId(feeConfigDto.getConfigId());
@@ -124,7 +149,8 @@
payFeePo.setFeeTypeCd(feeTypeCd);
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setAmount(importRoomFee.getAmount());
- payFeePo.setStartTime(importRoomFee.getStartTime());
+ //payFeePo.setStartTime(importRoomFee.getStartTime());
+ payFeePo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
payFeePos.add(payFeePo);
@@ -145,8 +171,11 @@
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(importRoomFee.getFloorNum() + "鏍�" + importRoomFee.getUnitNum() + "鍗曞厓" + 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);
@@ -156,18 +185,165 @@
feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
- //淇濆瓨鏃ュ織
- ImportFeePo importFeePo = new ImportFeePo();
- importFeePo.setCommunityId(communityId);
- importFeePo.setFeeTypeCd(feeTypeCd);
- importFeePo.setImportFeeId(importFeeId);
- importFeeInnerServiceSMOImpl.saveImportFee(importFeePo);
+ 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);
- return ResultVo.success();
+ 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");
+
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeTypeCd(feeTypeCd);
+ feeConfigDto.setFeeName(IMPORT_FEE_NAME);
+ 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.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);
+ 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);
}
/**
--
Gitblit v1.8.0