From d2a2a0543a9b504ce0a374dadf9d9c1034499d0e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 30 六月 2023 20:44:04 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 126 insertions(+), 25 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
index 99d7463..cbeb38e 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCarsCmd.java
@@ -2,19 +2,31 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.Environment;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.fee.PayFeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IParkingSpaceV1InnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
+import com.java110.po.fee.PayFeeDetailPo;
+import com.java110.po.fee.PayFeePo;
import com.java110.po.parking.ParkingSpacePo;
+import com.java110.po.payFee.PayFeeDetailMonthPo;
+import com.java110.po.reportFee.ReportOweFeePo;
+import com.java110.po.room.RoomPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -25,6 +37,7 @@
@Java110Cmd(serviceCode = "owner.deleteOwnerCars")
public class DeleteOwnerCarsCmd extends Cmd {
+
@Autowired
private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@@ -40,16 +53,28 @@
@Autowired
private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeDetailMonthInnerServiceSMO payFeeDetailMonthInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-//Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+ Environment.isDevEnv();
Assert.hasKeyAndValue(reqJson, "carId", "carId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "memberId", "memberId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
FeeDto feeDto = new FeeDto();
- feeDto.setPayerObjId(reqJson.getString("carId"));
+ feeDto.setPayerObjId(reqJson.getString("memberId"));
feeDto.setCommunityId(reqJson.getString("communityId"));
feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
List<FeeDto> feeDtoList = feeInnerServiceSMOImpl.queryFees(feeDto);
@@ -61,6 +86,7 @@
}
OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCarId(reqJson.getString("carId"));
ownerCarDto.setMemberId(reqJson.getString("memberId"));
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
@@ -71,14 +97,15 @@
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
if (reqJson.containsKey("psId") && !StringUtil.isEmpty(reqJson.getString("psId"))) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setPsId(reqJson.getString("psId"));
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ杞︿綅閿欒锛�");
- if (!StringUtil.isEmpty(parkingSpaceDtos.get(0).getParkingType()) && parkingSpaceDtos.get(0).getParkingType().equals("2")
- && !StringUtil.isEmpty(reqJson.getString("carTypeCd")) && reqJson.getString("carTypeCd").equals("1001")) { //瀛愭瘝杞︿綅
+ if (parkingSpaceDtos != null && parkingSpaceDtos.size() > 0 &&
+ "2".equals(parkingSpaceDtos.get(0).getParkingType())
+ && "1001".equals(reqJson.getString("carTypeCd"))) { //瀛愭瘝杞︿綅
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCarId(reqJson.getString("carId"));
ownerCarDto.setPsId(reqJson.getString("psId"));
@@ -101,30 +128,104 @@
if (StringUtil.isEmpty(reqJson.getString("psId")) || "-1".equals(reqJson.getString("psId"))) {
return;
}
- //閲婃斁杞︿綅
- if (reqJson.getString("carId").equals(reqJson.getString("memberId"))) {
- reqJson.put("carNumType", ParkingSpaceDto.STATE_FREE);//淇敼涓虹┖闂�
- ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setCommunityId(reqJson.getString("communityId"));
- parkingSpaceDto.setPsId(reqJson.getString("psId"));
- List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+ // todo 閲婃斁杞︿綅
+ releaseParkSpace(reqJson);
- if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
- //throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡璇㈠埌鍋滆溅浣嶄俊鎭�" + JSONObject.toJSONString(parkingSpaceDto));
- return;
- }
+ // todo 鍒犻櫎杞﹁締璐圭敤
+ deleteCarFee(reqJson);
+ }
- parkingSpaceDto = parkingSpaceDtos.get(0);
+ /**
+ * 閲婃斁杞︿綅淇℃伅
+ *
+ * @param reqJson
+ */
+ private void releaseParkSpace(JSONObject reqJson) {
+ int flag;
+ if (!reqJson.getString("carId").equals(reqJson.getString("memberId"))) {
+ return;
+ }
+ reqJson.put("carNumType", ParkingSpaceDto.STATE_FREE);//淇敼涓虹┖闂�
+ ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+ parkingSpaceDto.setCommunityId(reqJson.getString("communityId"));
+ parkingSpaceDto.setPsId(reqJson.getString("psId"));
+ List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- JSONObject businessParkingSpace = new JSONObject();
+ if (parkingSpaceDtos == null || parkingSpaceDtos.size() != 1) {
+ //throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡璇㈠埌鍋滆溅浣嶄俊鎭�" + JSONObject.toJSONString(parkingSpaceDto));
+ return;
+ }
- businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
- businessParkingSpace.put("state", reqJson.getString("carNumType"));
- ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
- flag = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
- if (flag < 1) {
- throw new IllegalArgumentException("淇敼杞﹁締鍑洪敊");
- }
+ parkingSpaceDto = parkingSpaceDtos.get(0);
+ JSONObject businessParkingSpace = new JSONObject();
+ businessParkingSpace.putAll(BeanConvertUtil.beanCovertMap(parkingSpaceDto));
+ businessParkingSpace.put("state", reqJson.getString("carNumType"));
+ ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
+ flag = parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇敼杞﹁締鍑洪敊");
}
}
+
+ /**
+ * 鍒犻櫎鎴垮眿璐圭敤
+ *
+ * @param reqJson
+ */
+ private void deleteCarFee(JSONObject reqJson) {
+
+ if (!reqJson.getString("carId").equals(reqJson.getString("memberId"))) {
+ return;
+ }
+
+ if (StringUtil.isEmpty(reqJson.getString("carId"))) {
+ throw new CmdException("杞﹁仈涓嶈兘涓虹┖");
+ }
+ PayFeeDto feeDto = new PayFeeDto();
+ feeDto.setPayerObjId(reqJson.getString("carId"));
+ feeDto.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
+ feeDto.setCommunityId(reqJson.getString("communityId"));
+ List<PayFeeDto> feeDtos = payFeeV1InnerServiceSMOImpl.queryPayFees(feeDto);
+
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return;
+ }
+
+ for (PayFeeDto payFeeDto : feeDtos) {
+ doDeleteFee(payFeeDto);
+ }
+
+ }
+
+ /**
+ * @param payFeeDto
+ */
+ private void doDeleteFee(PayFeeDto payFeeDto) {
+ //todo 鍒犻櫎缂磋垂璁板綍
+
+ PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
+ payFeeDetailPo.setFeeId(payFeeDto.getFeeId());
+ payFeeDetailPo.setCommunityId(payFeeDto.getCommunityId());
+ payFeeDetailV1InnerServiceSMOImpl.deletePayFeeDetailNew(payFeeDetailPo);
+
+ //todo 鍒犻櫎璐圭敤
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setFeeId(payFeeDto.getFeeId());
+ payFeePo.setCommunityId(payFeeDto.getCommunityId());
+ payFeeV1InnerServiceSMOImpl.deletePayFee(payFeePo);
+
+ //todo 鍒犻櫎娆犺垂
+ ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
+ reportOweFeePo.setFeeId(payFeeDto.getFeeId());
+ reportOweFeePo.setCommunityId(payFeeDto.getCommunityId());
+ reportOweFeeInnerServiceSMOImpl.deleteReportOweFee(reportOweFeePo);
+
+ //todo 鍒犻櫎 绂绘暎鏈堟暟鎹�
+ PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
+ payFeeDetailMonthPo.setFeeId(payFeeDto.getFeeId());
+ payFeeDetailMonthPo.setCommunityId(payFeeDto.getCommunityId());
+ payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+
+ }
+
}
--
Gitblit v1.8.0