From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 86 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 10 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 03a9440..ff970f8 100755
--- 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
@@ -3,20 +3,20 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.entity.assetImport.ImportRoomFee;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.dto.importData.ImportRoomFee;
import com.java110.fee.bmo.payFeeDetail.IImportPayFeeBMODetail;
import com.java110.intf.community.IRoomInnerServiceSMO;
-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.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.constant.StatusConstant;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
@@ -27,6 +27,7 @@
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
@Service("importPayFeeDetailBMOImpl")
@@ -49,6 +50,12 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
/**
* @param reqJson
@@ -93,6 +100,10 @@
if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
continue;
}
+
+ String endTime = importRoomFee.getEndTime();
+
+
importFeeDetail(importRoomFee, storeId, userId, batchId);
}
}
@@ -117,11 +128,13 @@
private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeNameEq(importRoomFee.getFeeName());
+ feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪鎴栧瓨鍦ㄥ鏉�");
+ if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ return;
+ }
FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
@@ -158,6 +171,17 @@
payFeePos = new ArrayList<>();
payFeePos.add(payFeePo);
feeInnerServiceSMOImpl.saveFee(payFeePos);
+ List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
+ //鏌ヨ涓氫富淇℃伅
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ importRoomFee.getEndTime()));
+ }
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, importRoomFee.getOwnerId()));
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, importRoomFee.getOwnerLink()));
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, importRoomFee.getOwnerName()));
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -182,11 +206,13 @@
private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeName(importRoomFee.getFeeName());
+ feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
- Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪鎴栧瓨鍦ㄥ鏉�");
+ if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ return;
+ }
FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
@@ -200,6 +226,8 @@
List<PayFeePo> payFeePos = null;
if (feeDtos == null || feeDtos.size() < 1) {
try {
+ List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
+
PayFeePo payFeePo = new PayFeePo();
payFeePo.setCommunityId(importRoomFee.getCommunityId());
payFeePo.setConfigId(feeDto.getConfigId());
@@ -223,6 +251,23 @@
payFeePos = new ArrayList<>();
payFeePos.add(payFeePo);
feeInnerServiceSMOImpl.saveFee(payFeePos);
+
+ //鏌ヨ涓氫富淇℃伅
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(importRoomFee.getRoomId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ importRoomFee.getEndTime()));
+ }
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, ownerRoomRelDtos.get(0).getOwnerId()));
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerRoomRelDtos.get(0).getLink()));
+ feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerRoomRelDtos.get(0).getOwnerName()));
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
+ }
+
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -238,6 +283,18 @@
}
}
+
+ public FeeAttrPo addFeeAttr(PayFeePo payFeePo, String specCd, String value) {
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(payFeePo.getCommunityId());
+ feeAttrPo.setSpecCd(specCd);
+ feeAttrPo.setValue(value);
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ return feeAttrPo;
+
+ }
+
private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) throws ParseException {
// FeeDetailDto feeDetailDto = new FeeDetailDto();
@@ -263,6 +320,15 @@
payFeeDetailPo.setPrimeRate("1.0");
payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
+ String endTime = importRoomFee.getEndTime();
+ //todo 鍛ㄦ湡鎬ц垂鐢ㄦ椂鏃堕棿鑷姩鍔犱竴澶╋紝鍥犱负鐗╀笟缁熻鐨凟xcel 涓�鑸皯涓�澶�
+ if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(DateUtil.getDateFromStringB(endTime));
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ endTime = DateUtil.getFormatTimeStringB(calendar.getTime());
+ importRoomFee.setEndTime(endTime);
+ }
payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
payFeeDetailPo.setRemark(importRoomFee.getRemark());
--
Gitblit v1.8.0