From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java b/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java
index fb275f6..f409eeb 100644
--- a/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java
@@ -19,31 +19,33 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
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.core.log.LoggerFactory;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.PayFeeDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.fee.PayFeePo;
+import com.java110.po.parking.ParkingSpacePo;
import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@@ -59,7 +61,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "parkingSpaceApply.updateParkingSpaceApply")
-public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
+public class UpdateParkingSpaceApplyCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(UpdateParkingSpaceApplyCmd.class);
@@ -69,11 +71,14 @@
@Autowired
private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
@Autowired
- private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+ private IPayFeeV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@Autowired
private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingSpaceV1InnerServiceSMO parkingSpaceV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -86,6 +91,17 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
+
+ //瀹℃牳澶辫触
+ if (ParkingSpaceApplyDto.STATE_FAIL.equals(parkingSpaceApplyPo.getState())) {
+ parkingSpaceApplyPo.setPsId("");
+ parkingSpaceApplyPo.setConfigId("");
+ int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ }
+ return;
+ }
PayFeePo payFeePo = new PayFeePo();
payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
@@ -135,10 +151,18 @@
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
catId = ownerCarPo.getCarId();
- }else {
+ } else {
catId = ownerCarDtos.get(0).getCarId();
}
+ // 灏嗚溅浣嶇姸鎬� 淇敼涓哄凡鍑虹鐘舵��
+ ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
+ parkingSpacePo.setPsId(parkingSpaceApply.getPsId());
+ parkingSpacePo.setState(ParkingSpaceDto.STATE_HIRE);
+ flag = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊杞︿綅鐘舵�佸け璐�");
+ }
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setConfigId(parkingSpaceApply.getConfigId());
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
@@ -161,13 +185,13 @@
payFeePo.setStartTime(parkingSpaceApply.getStartTime());
payFeePo.setEndTime(parkingSpaceApply.getEndTime());
payFeePo.setAmount("0");
- payFeePo.setFeeFlag("1003006");
- payFeePo.setState("2009001");
- payFeePo.setPayerObjType("6666");
+ payFeePo.setFeeFlag(feeConfig.getFeeFlag());
+ payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_PARKING_SPACE);
payFeePo.setBatchId("-1");
payFeePo.setbId("-1");
payFeePo.setUserId(userId);
- flag = payFeeNewV1InnerServiceSMOImpl.savePayFeeNew(payFeePo);
+ flag = payFeeNewV1InnerServiceSMOImpl.savePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
--
Gitblit v1.8.0