From 630cb0babb264657d8a07476e328654573620f8c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 3 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 1e9fa5a..051399c 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
@@ -22,8 +22,20 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.PayFeeDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
+import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.po.fee.PayFeePo;
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;
@@ -32,6 +44,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
@@ -47,11 +61,19 @@
@Java110Cmd(serviceCode = "parkingSpaceApply.updateParkingSpaceApply")
public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(UpdateParkingSpaceApplyCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateParkingSpaceApplyCmd.class);
-
+ public static final String CODE_PREFIX_ID = "10";
@Autowired
private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+ @Autowired
+ private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+ @Autowired
+ private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -62,15 +84,93 @@
@Override
@Java110Transactional
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);
- ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ parkingSpaceApplyPo.setFeeId(payFeePo.getFeeId());
int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
+ ParkingSpaceApplyDto parkingSpaceApplyDto = new ParkingSpaceApplyDto();
+ parkingSpaceApplyDto.setApplyId(parkingSpaceApplyPo.getApplyId());
+ List<ParkingSpaceApplyDto> parkingSpaceApplyDtos = parkingSpaceApplyV1InnerServiceSMOImpl.queryParkingSpaceApplys(parkingSpaceApplyDto);
+
+ if (parkingSpaceApplyDtos == null || parkingSpaceApplyDtos.size() < 1) {
+ throw new CmdException("鏈煡璇㈠埌鐢宠鍗曪紝璇疯仈绯荤鐞嗗憳");
+ }
+ ParkingSpaceApplyDto parkingSpaceApply = parkingSpaceApplyDtos.get(0);
+
+ //2銆佸鏍哥殑鏃讹紝鍒ゆ柇杞﹁締鏄惁鍦╫wner_car涓湁锛屾湁灏辫烦杩囥�� 娌℃湁鐨勮瘽鍐欏叆owner_car锛�--閮借鍐欏叆pay_fee銆�
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCarNum(parkingSpaceApplyPo.getCarNum());
+ 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());
+ ownerCarPo.setStartTime(parkingSpaceApply.getStartTime());
+ ownerCarPo.setEndTime(parkingSpaceApply.getEndTime());
+ ownerCarPo.setPsId(parkingSpaceApply.getPsId());
+ ownerCarPo.setState("1001");
+ ownerCarPo.setUserId(userId);
+ ownerCarPo.setRemark("杞︿綅鐢宠锛岀郴缁熻嚜鍔ㄥ啓鍏�");
+ flag = ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ }
+ catId = ownerCarPo.getCarId();
+ }else {
+ catId = ownerCarDtos.get(0).getCarId();
+ }
+
+ 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("1003006");
+ payFeePo.setState("2009001");
+ payFeePo.setPayerObjType("6666");
+ payFeePo.setBatchId("-1");
+ payFeePo.setbId("-1");
+ payFeePo.setUserId(userId);
+ flag = payFeeNewV1InnerServiceSMOImpl.savePayFeeNew(payFeePo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ }
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0