From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
index 659c550..b9952ac 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
@@ -4,7 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeAttrDto;
@@ -12,7 +12,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
import com.java110.fee.bmo.fee.IFeeBMO;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
@@ -24,7 +24,7 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -40,7 +40,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "fee.saveParkingSpaceCreateFee")
-public class SaveParkingSpaceCreateFeeCmd extends AbstractServiceCmdListener {
+public class SaveParkingSpaceCreateFeeCmd extends Cmd {
@Autowired
private IFeeBMO feeBMOImpl;
@@ -91,7 +91,7 @@
reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
Date endTime = null;
Date configEndTime = null;
try {
@@ -220,11 +220,14 @@
int curFailRoomCount = 0;
//娣诲姞鍗曞厓淇℃伅
int saveFlag = 0;
+ List<ParkingSpaceDto> parkingSpaceDtos = null;
+ ParkingSpaceDto parkingSpaceDto = null;
+ String carName = "";
for (int ownerCarIndex = 0; ownerCarIndex < ownerCarDtos.size(); ownerCarIndex++) {
curFailRoomCount++;
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addFee(ownerCarDtos.get(ownerCarIndex), reqJson, context), PayFeePo.class));
if (!StringUtil.isEmpty(ownerCarDtos.get(ownerCarIndex).getOwnerId())) {
- if (FeeDto.FEE_FLAG_ONCE.equals(reqJson.getString("feeFlag"))) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
}
@@ -233,9 +236,20 @@
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerCarDtos.get(ownerCarIndex).getOwnerName()));
}
+ parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setCarNum(ownerCarDtos.get(ownerCarIndex).getCarNum());
+ parkingSpaceDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
+ parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+
+ if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 0) {
+ carName = parkingSpaceDtos.get(0).getAreaNum() + parkingSpaceDtos.get(0).getNum() + "(" + ownerCarDtos.get(ownerCarIndex).getCarNum() + ")";
+ } else {
+ carName = ownerCarDtos.get(ownerCarIndex).getCarNum();
+ }
+
//浠樿垂瀵硅薄鍚嶇О
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
- ownerCarDtos.get(ownerCarIndex).getAreaNum() + ownerCarDtos.get(ownerCarIndex).getNum() + "(" + ownerCarDtos.get(ownerCarIndex).getCarNum() + ")"));
+ carName));
if (ownerCarIndex % DEFAULT_ADD_FEE_COUNT == 0 && ownerCarIndex != 0) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
--
Gitblit v1.8.0