From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +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 | 246 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 201 insertions(+), 45 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 79dbb98..899ca37
--- 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
@@ -2,22 +2,27 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.fee.bmo.payFeeDetail.IImportPayFeeBMODetail;
-import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
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.*;
+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;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -45,6 +50,15 @@
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
/**
* @param reqJson
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -56,6 +70,8 @@
String communityId = reqJson.getString("communityId");
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");
@@ -70,18 +86,35 @@
if (importRoomFees.size() < 1) {
return ResultVo.success();
}
-
- importFeeDetails(storeId, userId, importRoomFees);
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(objType)) {
+ importFeeDetails(storeId, userId, importRoomFees, batchId);
+ } else {
+ 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, String batchId) {
+
+ importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
+ for (ImportRoomFee importCarFee : importCarFees) {
+ if (StringUtil.isEmpty(importCarFee.getCarId())) {
+ continue;
+ }
+ importCarFeeDetail(importCarFee, storeId, userId, batchId);
}
}
@@ -90,44 +123,64 @@
*
* @param importRoomFee
*/
- private void importFeeDetail(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);
- Assert.listOnlyOne(feeConfigDtos, "璐圭敤涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯");
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪鎴栧瓨鍦ㄥ鏉�");
FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
FeeDto feeDto = new FeeDto();
feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
feeDto.setCommunityId(importRoomFee.getCommunityId());
- feeDto.setPayerObjId(importRoomFee.getRoomId());
- feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ feeDto.setPayerObjId(importRoomFee.getCarId());
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
List<PayFeePo> payFeePos = null;
if (feeDtos == null || feeDtos.size() < 1) {
- PayFeePo payFeePo = new PayFeePo();
- payFeePo.setCommunityId(importRoomFee.getCommunityId());
- payFeePo.setConfigId(feeDto.getConfigId());
- payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
- payFeePo.setStartTime(importRoomFee.getStartTime());
- payFeePo.setEndTime(importRoomFee.getEndTime());
- payFeePo.setAmount(importRoomFee.getAmount());
- payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
- payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
- payFeePo.setIncomeObjId(storeId);
- payFeePo.setState(FeeDto.STATE_DOING);
- payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
- payFeePo.setPayerObjId(importRoomFee.getRoomId());
- payFeePo.setUserId(userId);
- payFeePo.setCreateTime(importRoomFee.getCreateTime());
- payFeePos = new ArrayList<>();
- payFeePos.add(payFeePo);
- feeInnerServiceSMOImpl.saveFee(payFeePos);
+ try {
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setCommunityId(importRoomFee.getCommunityId());
+ payFeePo.setConfigId(feeDto.getConfigId());
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ payFeePo.setStartTime(importRoomFee.getStartTime());
+ payFeePo.setEndTime(importRoomFee.getEndTime());
+ payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
+ payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
+ payFeePo.setIncomeObjId(storeId);
+ 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);
+ payFeePo.setCreateTime(importRoomFee.getCreateTime());
+ 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();
+ }
feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
}
@@ -141,21 +194,117 @@
}
- private void doImportFeeDetail(FeeDto tmpFeeDto, ImportRoomFee importRoomFee) throws ParseException {
- FeeDetailDto feeDetailDto = new FeeDetailDto();
- feeDetailDto.setCommunityId(importRoomFee.getCommunityId());
- feeDetailDto.setFeeId(tmpFeeDto.getFeeId());
+ /**
+ * 瀵煎叆 璐圭敤鍘嗗彶
+ *
+ * @param importRoomFee
+ */
+ private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {
+
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setFeeName(importRoomFee.getFeeName());
+ feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+
+ Assert.listOnlyOne(feeConfigDtos, "璐圭敤椤逛笉瀛樺湪鎴栧瓨鍦ㄥ鏉�");
+
+ FeeConfigDto tmpFeeConfigDto = feeConfigDtos.get(0);
+
+ FeeDto feeDto = new FeeDto();
+ feeDto.setConfigId(tmpFeeConfigDto.getConfigId());
+ feeDto.setCommunityId(importRoomFee.getCommunityId());
+ feeDto.setPayerObjId(importRoomFee.getRoomId());
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+ 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());
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ payFeePo.setStartTime(importRoomFee.getStartTime());
+ payFeePo.setEndTime(importRoomFee.getEndTime());
+ payFeePo.setAmount(importRoomFee.getAmount());
+ payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
+ payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
+ payFeePo.setIncomeObjId(storeId);
+ 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);
+ payFeePo.setCreateTime(importRoomFee.getCreateTime());
+ 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);
+ }
- 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;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
}
+
+ for (FeeDto tmpFeeDto : feeDtos) {
+ try {
+ doImportFeeDetail(tmpFeeDto, importRoomFee);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+
+ 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();
+// 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());
@@ -169,6 +318,8 @@
payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
payFeeDetailPo.setRemark(importRoomFee.getRemark());
payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
+ payFeeDetailPo.setState("1400");
+ payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
if (saved < 1) {
@@ -182,8 +333,13 @@
//濡傛灉缁撴潫鏃堕棿灏忎簬 缂磋垂缁撴潫鏃堕棿鍒欏欢鏈�
PayFeePo payFeePo = new PayFeePo();
payFeePo.setCommunityId(importRoomFee.getCommunityId());
+ 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