From b2b5bdf6f42597e582da96aa56707e1f68d3936e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:41:44 +0800
Subject: [PATCH] 优化 费用
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 76 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 27 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
old mode 100644
new mode 100755
index f6b1d27..7212f5c
--- 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
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.fee.bmo.payFeeDetail.IImportPayFeeBMODetail;
@@ -20,6 +19,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;
@@ -62,6 +62,7 @@
String storeId = reqJson.getString("storeId");
String userId = reqJson.getString("userId");
String objType = reqJson.getString("objType");
+ String batchId = reqJson.getString("batchId");
JSONArray datas = reqJson.getJSONArray("importRoomFees");
@@ -77,28 +78,34 @@
return ResultVo.success();
}
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(objType)) {
- importFeeDetails(storeId, userId, importRoomFees);
+ importFeeDetails(storeId, userId, importRoomFees, batchId);
} else {
- importCarFeeDetails(storeId, userId, importRoomFees);
+ importCarFeeDetails(storeId, userId, importRoomFees, batchId);
}
return ResultVo.success();
}
- private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees) {
+ private void importFeeDetails(String storeId, String userId, List<ImportRoomFee> importRoomFees, String batchId) {
importRoomFees = roomInnerServiceSMOImpl.freshRoomIds(importRoomFees);
for (ImportRoomFee importRoomFee : importRoomFees) {
- importFeeDetail(importRoomFee, storeId, userId);
+ if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
+ continue;
+ }
+ importFeeDetail(importRoomFee, storeId, userId, batchId);
}
}
- private void importCarFeeDetails(String storeId, String userId, List<ImportRoomFee> importCarFees) {
+ private void importCarFeeDetails(String storeId, String userId, List<ImportRoomFee> importCarFees, String batchId) {
importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
for (ImportRoomFee importCarFee : importCarFees) {
- importCarFeeDetail(importCarFee, storeId, userId);
+ if (StringUtil.isEmpty(importCarFee.getCarId())) {
+ continue;
+ }
+ importCarFeeDetail(importCarFee, storeId, userId, batchId);
}
}
@@ -107,10 +114,10 @@
*
* @param importRoomFee
*/
- private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId) {
+ private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
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,12 @@
payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
payFeePo.setIncomeObjId(storeId);
- payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setBatchId(batchId);
+ 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);
@@ -167,7 +179,7 @@
*
* @param importRoomFee
*/
- private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId) {
+ private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setFeeName(importRoomFee.getFeeName());
@@ -198,7 +210,12 @@
payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
payFeePo.setIncomeObjId(storeId);
- payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setBatchId(batchId);
+ 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 +232,7 @@
for (FeeDto tmpFeeDto : feeDtos) {
try {
doImportFeeDetail(tmpFeeDto, importRoomFee);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -223,20 +240,20 @@
}
private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) throws ParseException {
- FeeDetailDto feeDetailDto = new FeeDetailDto();
- feeDetailDto.setCommunityId(importRoomFee.getCommunityId());
- feeDetailDto.setFeeId(tmpFeeDto.getFeeId());
-
-
- feeDetailDto.setStartTime(DateUtil.getDateFromString(importRoomFee.getStartTime(), DateUtil.DATE_FORMATE_STRING_B));
- feeDetailDto.setEndTime(DateUtil.getDateFromString(importRoomFee.getEndTime(), DateUtil.DATE_FORMATE_STRING_B));
- feeDetailDto.setCreateTime(DateUtil.getDateFromString(importRoomFee.getCreateTime(), DateUtil.DATE_FORMATE_STRING_B));
-
- List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-
- if (feeDetailDtos != null && feeDetailDtos.size() > 0) {//璇存槑宸茬粡瀵煎叆杩囦簡
- return;
- }
+// FeeDetailDto feeDetailDto = new FeeDetailDto();
+// feeDetailDto.setCommunityId(importRoomFee.getCommunityId());
+// feeDetailDto.setFeeId(tmpFeeDto.getFeeId());
+//
+//
+// feeDetailDto.setStartTime(DateUtil.getDateFromString(importRoomFee.getStartTime(), DateUtil.DATE_FORMATE_STRING_B));
+// feeDetailDto.setEndTime(DateUtil.getDateFromString(importRoomFee.getEndTime(), DateUtil.DATE_FORMATE_STRING_B));
+// feeDetailDto.setCreateTime(DateUtil.getDateFromString(importRoomFee.getCreateTime(), DateUtil.DATE_FORMATE_STRING_B));
+//
+// List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+//
+// if (feeDetailDtos != null && feeDetailDtos.size() > 0) {//璇存槑宸茬粡瀵煎叆杩囦簡
+// return;
+// }
PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
@@ -250,6 +267,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 +284,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