From a11de62c761a0e0c382fed88f240e47248bc388c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 十月 2021 19:28:13 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
index 13f0326..adca7b9 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
@@ -18,6 +18,7 @@
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
import com.java110.intf.common.ICarInoutDetailV1InnerServiceSMO;
+import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
@@ -30,6 +31,7 @@
import com.java110.po.car.CarInoutDetailPo;
import com.java110.po.car.CarInoutPo;
import com.java110.po.car.OwnerCarPo;
+import com.java110.po.carInoutPayment.CarInoutPaymentPo;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.OwnerPo;
@@ -94,6 +96,9 @@
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+ @Autowired
+ private ICarInoutPaymentV1InnerServiceSMO carInoutPaymentV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "machineCode", "蹇呭～锛岃濉啓璁惧缂栫爜");
@@ -129,12 +134,10 @@
tempCar = CAR_TYPE_NO_DATA;
} else {
reqJson.put("carId", ownerCarDtos.get(0).getCarId());
+ if (OwnerCarDto.CAR_TYPE_TEMP.equals(ownerCarDtos.get(0).getCarType())) {
+ tempCar = CAR_TYPE_TEMP;
+ }
}
-
- if (OwnerCarDto.CAR_TYPE_TEMP.equals(ownerCarDtos.get(0).getCarType())) {
- tempCar = CAR_TYPE_TEMP;
- }
-
//杩涘満澶勭悊
if (MachineDto.DIRECTION_IN.equals(machineDtos.get(0).getDirection())) {
@@ -199,8 +202,62 @@
//灏嗙姸鎬佹洿鏂颁负 鍑哄満鐘舵��
+ CarInoutPo carInoutPo = new CarInoutPo();
+ carInoutPo.setPaId(carInoutDtos.get(0).getPaId());
+ carInoutPo.setOutTime(reqJson.getString("outTime"));
+ carInoutPo.setInoutId(carInoutDtos.get(0).getInoutId());
+ carInoutPo.setCommunityId(carInoutDtos.get(0).getCommunityId());
+ carInoutPo.setState(CarInoutDto.STATE_OUT);
+ flag = carInoutV1InnerServiceSMOImpl.updateCarInout(carInoutPo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鍑哄満鏃堕棿澶辫触");
+ }
+ //鍐欐敮浠樿褰�
+ CarInoutPaymentPo carInoutPaymentPo = new CarInoutPaymentPo();
+ carInoutPaymentPo.setCommunityId(carInoutDtos.get(0).getCommunityId());
+ carInoutPaymentPo.setInoutId(carInoutDtos.get(0).getInoutId());
+ carInoutPaymentPo.setPaId(carInoutDtos.get(0).getPaId());
+ carInoutPaymentPo.setPayCharge(reqJson.getString("payCharge"));
+ carInoutPaymentPo.setPayType(reqJson.getString("payType"));
+ carInoutPaymentPo.setRealCharge(reqJson.getString("realCharge"));
+ flag = carInoutPaymentV1InnerServiceSMOImpl.saveCarInoutPayment(carInoutPaymentPo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鍑哄満鏃堕棿澶辫触");
+ }
+
+ //鏈堢杞�
+ if (tempCar != CAR_TYPE_NO_DATA && tempCar != CAR_TYPE_TEMP) {
+ return;
+ }
+
+ //涓存椂杞︽椂鏌ョ湅 鏄惁鏈夎垂鐢ㄦ病鏈夌粨鏉燂紝鍙兘鏄崐灏忔椂鍏嶈垂 闂 鎴栬�呮椂 鍏朵粬鍘熷洜 灏嗚垂鐢ㄧ粨鏉�
+ FeeAttrDto feeAttrDto = new FeeAttrDto();
+ feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_CAR_INOUT_ID);
+ feeAttrDto.setValue(carInoutPo.getInoutId());
+ feeAttrDto.setCommunityId(carInoutDtos.get(0).getCommunityId());
+ List<FeeAttrDto> feeAttrDtos = feeAttrInnerServiceSMOImpl.queryFeeAttrs(feeAttrDto);
+
+ if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+ return;
+ }
+ FeeDto feeDto = new FeeDto();
+ feeDto.setCommunityId(carInoutDtos.get(0).getCommunityId());
+ feeDto.setFeeId(feeAttrDtos.get(0).getFeeId());
+ feeDto.setState(FeeDto.STATE_DOING);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ if (feeDtos == null || feeDtos.size() < 1) {
+ return;
+ }
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setState(FeeDto.STATE_FINISH);
+ payFeePo.setFeeId(feeDtos.get(0).getFeeId());
+ payFeePo.setCommunityId(feeDtos.get(0).getCommunityId());
+ flag = feeInnerServiceSMOImpl.updateFee(payFeePo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鍑哄満鏃堕棿澶辫触");
+ }
}
/**
@@ -224,6 +281,7 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鍏ヨ褰曞け璐�");
}
+ reqJson.put("inoutId", carInoutPo.getInoutId());
//淇濆瓨鏄庣粏
CarInoutDetailPo carInoutDetailPo = new CarInoutDetailPo();
@@ -343,6 +401,13 @@
feeAttrPo.setValue("11111111111");
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(reqJson.getString("communityId"));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_CAR_INOUT_ID);
+ feeAttrPo.setValue(reqJson.getString("inoutId"));
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
int flag = feeInnerServiceSMOImpl.saveFee(payFeePos);
if (flag < 1) {
throw new CmdException("淇濆瓨涓存椂杞﹁垂鐢ㄥけ璐�");
@@ -399,6 +464,7 @@
ownerCarPo.setPsId("-1");
ownerCarPo.setMemberId(ownerCarPo.getCarId());
ownerCarPo.setCarTypeCd(OwnerCarDto.CAR_TYPE_CD_TEMP);
+ ownerCarPo.setCarType("9901");
ownerCarPo.setCarBrand("鏈煡");
ownerCarPo.setCarColor("鏈煡");
ownerCarPo.setCarNum(reqJson.getString("carNum"));
--
Gitblit v1.8.0