From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 b5814c1..7212f5c 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
@@ -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;
@@ -63,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");
@@ -78,31 +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) {
- if(StringUtil.isEmpty(importRoomFee.getRoomId())){
+ if (StringUtil.isEmpty(importRoomFee.getRoomId())) {
continue;
}
- importFeeDetail(importRoomFee, storeId, userId);
+ 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);
}
}
@@ -111,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);
@@ -142,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);
@@ -171,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());
@@ -202,9 +210,10 @@
payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
payFeePo.setIncomeObjId(storeId);
- if(FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
+ payFeePo.setBatchId(batchId);
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
payFeePo.setState(FeeDto.STATE_FINISH);
- }else {
+ } else {
payFeePo.setState(FeeDto.STATE_DOING);
}
payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
@@ -223,7 +232,7 @@
for (FeeDto tmpFeeDto : feeDtos) {
try {
doImportFeeDetail(tmpFeeDto, importRoomFee);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -258,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) {
@@ -274,7 +284,7 @@
payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
payFeePo.setFeeId(tmpFeeDto.getFeeId());
payFeePo.setEndTime(importRoomFee.getEndTime());
- if(FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
+ if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
payFeePo.setState(FeeDto.STATE_FINISH);
}
--
Gitblit v1.8.0