From 2d9f375aa63d2eb16fb4849f23536542e27caa2f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 30 九月 2022 13:29:48 +0800
Subject: [PATCH] 优化代码
---
service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java | 93 ++++++++++------------------------------------
1 files changed, 21 insertions(+), 72 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 f409eeb..a8792d5 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
@@ -26,6 +26,7 @@
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.fee.FeeConfigDto;
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.dto.parkingSpaceApply.ParkingSpaceApplyDto;
@@ -71,7 +72,7 @@
@Autowired
private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
@Autowired
- private IPayFeeV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+ private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@Autowired
@@ -92,21 +93,6 @@
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));
-
- parkingSpaceApplyPo.setFeeId(payFeePo.getFeeId());
int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
if (flag < 1) {
@@ -128,70 +114,33 @@
ownerCarDto.setCommunityId(parkingSpaceApplyPo.getCommunityId());
List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
String catId = "";
- OwnerCarPo ownerCarPo = new OwnerCarPo();
if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
- ownerCarPo.setCarId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- ownerCarPo.setOwnerId(parkingSpaceApply.getApplyPersonId());
- ownerCarPo.setbId("-1");
- ownerCarPo.setCarNum(parkingSpaceApply.getCarNum());
- ownerCarPo.setCarColor(parkingSpaceApply.getCarColor());
- ownerCarPo.setCarBrand(parkingSpaceApply.getCarBrand());
- ownerCarPo.setCarType(parkingSpaceApply.getCarType());
- ownerCarPo.setCarTypeCd("1001");
- ownerCarPo.setCommunityId(parkingSpaceApply.getCommunityId());
- ownerCarPo.setMemberId(ownerCarPo.getCarId());
+ return;
+ } else {
+ catId = ownerCarDtos.get(0).getCarId();
+ OwnerCarPo ownerCarPo = new OwnerCarPo();
+ ownerCarPo.setCarId(catId);
ownerCarPo.setStartTime(parkingSpaceApply.getStartTime());
ownerCarPo.setEndTime(parkingSpaceApply.getEndTime());
- ownerCarPo.setPsId(parkingSpaceApply.getPsId());
- ownerCarPo.setState("1001");
- ownerCarPo.setUserId(userId);
- ownerCarPo.setRemark("杞︿綅鐢宠锛岀郴缁熻嚜鍔ㄥ啓鍏�");
- flag = ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ flag = ownerCarV1InnerServiceSMOImpl.updateOwnerCar(ownerCarPo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
- catId = ownerCarPo.getCarId();
- } else {
- catId = ownerCarDtos.get(0).getCarId();
}
+ PayFeeDto feeDto = new PayFeeDto();
+ feeDto.setFeeId(parkingSpaceApply.getFeeId());
+ feeDto.setCommunityId(parkingSpaceApply.getCommunityId());
+ feeDto.setConfigId(parkingSpaceApply.getConfigId());
+ List<PayFeeDto> payFeeDtos = payFeeV1InnerServiceSMOImpl.queryPayFees(feeDto);
+ if(payFeeDtos == null || payFeeDtos.size() <1){
+ return ;
+ }
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setCommunityId(payFeeDtos.get(0).getCommunityId());
+ payFeePo.setFeeId(payFeeDtos.get(0).getFeeId());
+ payFeePo.setEndTime(parkingSpaceApply.getStartTime());
- // 灏嗚溅浣嶇姸鎬� 淇敼涓哄凡鍑虹鐘舵��
- 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);
- if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
- throw new CmdException("鏈煡璇㈠埌鐩稿叧璐圭敤椤硅缃紝璇疯仈绯荤鐞嗗憳");
- }
- CommunityMemberDto communityMemberDto = new CommunityMemberDto();
- communityMemberDto.setCommunityId(parkingSpaceApply.getCommunityId());
- communityMemberDto.setMemberTypeCd("390001200002");
- List<CommunityMemberDto> communityMemberDtos = communityMemberV1InnerServiceSMOImpl.queryCommunityMembers(communityMemberDto);
- if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
- throw new CmdException("鏈煡璇㈠埌灏忓尯鍜屽晢鎴风殑鍏崇郴锛岃鑱旂郴绠＄悊鍛�");
- }
- FeeConfigDto feeConfig = feeConfigDtos.get(0);
- payFeePo.setCommunityId(feeConfig.getCommunityId());
- payFeePo.setConfigId(feeConfig.getConfigId());
- payFeePo.setFeeTypeCd(feeConfig.getFeeTypeCd());
- payFeePo.setPayerObjId(catId);
- payFeePo.setIncomeObjId(communityMemberDtos.get(0).getMemberId());//鏍规嵁灏忓尯ID鏌ヨstoreId
- payFeePo.setStartTime(parkingSpaceApply.getStartTime());
- payFeePo.setEndTime(parkingSpaceApply.getEndTime());
- payFeePo.setAmount("0");
- 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.savePayFee(payFeePo);
+ flag = payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
--
Gitblit v1.8.0