From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 3379a63..5915f5e 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
@@ -20,6 +20,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.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -89,6 +90,9 @@
importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
for (ImportRoomFee importRoomFee : importRoomFees) {
+ if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
+ continue;
+ }
importFeeDetail(importRoomFee, storeId, userId);
}
}
@@ -98,6 +102,9 @@
importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
for (ImportRoomFee importCarFee : importCarFees) {
+ if (StringUtil.isEmpty(importCarFee.getCarId())) {
+ continue;
+ }
importCarFeeDetail(importCarFee, storeId, userId);
}
}
@@ -110,7 +117,7 @@
private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
- feeConfigDto.setFeeName(importRoomFee.getFeeName());
+ feeConfigDto.setFeeNameEq(importRoomFee.getFeeName());
feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -138,7 +145,11 @@
payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
payFeePo.setIncomeObjId(storeId);
- payFeePo.setState(FeeDto.STATE_DOING);
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
+ payFeePo.setState(FeeDto.STATE_FINISH);
+ } else {
+ payFeePo.setState(FeeDto.STATE_DOING);
+ }
payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
payFeePo.setPayerObjId(importRoomFee.getCarId());
payFeePo.setUserId(userId);
@@ -198,7 +209,11 @@
payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
payFeePo.setIncomeObjId(storeId);
- payFeePo.setState(FeeDto.STATE_DOING);
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
+ payFeePo.setState(FeeDto.STATE_FINISH);
+ } else {
+ payFeePo.setState(FeeDto.STATE_DOING);
+ }
payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
payFeePo.setPayerObjId(importRoomFee.getRoomId());
payFeePo.setUserId(userId);
@@ -215,7 +230,7 @@
for (FeeDto tmpFeeDto : feeDtos) {
try {
doImportFeeDetail(tmpFeeDto, importRoomFee);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -250,6 +265,7 @@
payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
payFeeDetailPo.setRemark(importRoomFee.getRemark());
payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
+ payFeeDetailPo.setState("1400");
int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
if (saved < 1) {
@@ -266,6 +282,10 @@
payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
payFeePo.setFeeId(tmpFeeDto.getFeeId());
payFeePo.setEndTime(importRoomFee.getEndTime());
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
+ payFeePo.setState(FeeDto.STATE_FINISH);
+ }
+
feeInnerServiceSMOImpl.updateFee(payFeePo);
}
--
Gitblit v1.8.0