From 7da40dfc8536c46b574024c23bcfb5f2504114d9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 23 十月 2022 18:03:18 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 50 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 55b512d..e5c19aa 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
@@ -1,5 +1,6 @@
package com.java110.common.cmd.machineTranslate;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -18,7 +19,10 @@
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.parkingCouponCar.ParkingCouponCarDto;
import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
+import com.java110.intf.acct.IParkingCouponCarOrderV1InnerServiceSMO;
+import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutDetailV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
@@ -41,6 +45,8 @@
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.OwnerPo;
+import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
+import com.java110.po.parkingCouponCarOrder.ParkingCouponCarOrderPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
@@ -114,6 +120,12 @@
@Autowired
private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarV1InnerServiceSMO parkingCouponCarV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarOrderV1InnerServiceSMO parkingCouponCarOrderV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -303,54 +315,37 @@
updateCarInoutState(reqJson, carInoutDtos.get(0));
- //鍐欐敮浠樿褰�
-// CarInoutPaymentPo carInoutPaymentPo = new CarInoutPaymentPo();
-// carInoutPaymentPo.setPaymentId(GenerateCodeFactory.getGeneratorId("10"));
-// 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;
-// }
-//
-// //濡傛灉鏈夎垂鐢� 鍒欑即璐�
-// boolean hasFee = hasFeeAndPayFee(carInoutDtos.get(0), reqJson, carInoutPo, carInoutPaymentPo);
-//
-// double realCharge = Double.parseDouble(carInoutPaymentPo.getRealCharge());
-//
-// //鏈夎垂鐢� 鎴栬�� 缂磋垂涓�0 鏃剁粨鏉�
-// if (hasFee || realCharge == 0) {
-// return;
-// }
-// // 鍒ゆ柇鏄惁瀛樺湪 涓存椂杞� 铏氭嫙涓氫富
-// OwnerDto ownerDto = new OwnerDto();
-// ownerDto.setCommunityId(reqJson.getString("communityId"));
-// ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
-// ownerDto.setOwnerFlag(OwnerDto.OWNER_FLAG_FALSE);
-// ownerDto.setName(TEMP_CAR_OWNER);
-// List<OwnerDto> ownerDtos = buildingOwnerV1InnerServiceSMOImpl.queryBuildingOwners(ownerDto);
-// if (ownerDtos == null || ownerDtos.size() < 1) {
-// return;
-// }
-// JSONObject paramIn = new JSONObject();
-// paramIn.put("inTime", carInoutDtos.get(0).getInTime());
-// paramIn.put("carId", reqJson.getString("carId"));
-// paramIn.put("communityId", carInoutDtos.get(0).getCommunityId());
-// paramIn.put("inoutId", carInoutDtos.get(0).getInoutId());
-// paramIn.put("ownerId", ownerDtos.get(0).getMemberId());
-// saveTempCarFee(paramIn, machineDto);
-//
-// //鍐嶅幓缂磋垂
-// hasFeeAndPayFee(carInoutDtos.get(0), reqJson, carInoutPo, carInoutPaymentPo);
+ //澶勭悊鍋滆溅鍔�
+ if(!reqJson.containsKey("pccIds") || reqJson.getJSONArray("pccIds").size()<1){
+ return ;
+ }
+
+ JSONArray pccIds = reqJson.getJSONArray("pccIds");
+ String pccId = "";
+ ParkingCouponCarPo parkingCouponCarPo = null;
+ ParkingCouponCarOrderPo parkingCouponCarOrderPo = null;
+ for(int pccIdIndex = 0 ;pccIdIndex < pccIds.size();pccIdIndex++){
+ pccId = pccIds.getString(pccIdIndex);
+
+ parkingCouponCarPo = new ParkingCouponCarPo();
+ parkingCouponCarPo.setPccId(pccId);
+ parkingCouponCarPo.setState(ParkingCouponCarDto.STATE_FINISH);
+ parkingCouponCarV1InnerServiceSMOImpl.updateParkingCouponCar(parkingCouponCarPo);
+
+ parkingCouponCarOrderPo = new ParkingCouponCarOrderPo();
+ parkingCouponCarOrderPo.setOrderId(GenerateCodeFactory.getGeneratorId("11"));
+ parkingCouponCarOrderPo.setCarNum(reqJson.getString("carNum"));
+ parkingCouponCarOrderPo.setCarOutId(carInoutDetailPo.getDetailId());
+ parkingCouponCarOrderPo.setCommunityId(reqJson.getString("communityId"));
+ parkingCouponCarOrderPo.setMachineId(machineDto.getMachineId());
+ parkingCouponCarOrderPo.setMachineName(machineDto.getMachineName());
+ parkingCouponCarOrderPo.setPaId(carInoutDtos.get(0).getPaId());
+ parkingCouponCarOrderPo.setPccId(pccId);
+ parkingCouponCarOrderPo.setRemark("杞﹁締鍑哄彛鏍搁攢鍋滆溅鍔�");
+
+ parkingCouponCarOrderV1InnerServiceSMOImpl.saveParkingCouponCarOrder(parkingCouponCarOrderPo);
+ }
+
}
private void updateCarInoutState(JSONObject reqJson, CarInoutDto carInoutDto) {
@@ -372,8 +367,8 @@
});
List<CarInoutDto> carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(newCarInoutDto);
- if(carInoutDtos == null || carInoutDtos.size()<1){
- return ;
+ if (carInoutDtos == null || carInoutDtos.size() < 1) {
+ return;
}
CarInoutPo carInoutPo = new CarInoutPo();
@@ -672,6 +667,16 @@
*/
private void saveTempCar(JSONObject reqJson, MachineDto machineDto) {
+ OwnerCarDto ownerCarDto = new OwnerCarDto();
+ ownerCarDto.setCarNum(reqJson.getString("carNum"));
+ ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+ if (ownerCarDtos != null && ownerCarDtos.size() > 0) {
+ reqJson.put("carId", ownerCarDtos.get(0).getCarId());
+ return;
+ }
+
OwnerCarPo ownerCarPo = new OwnerCarPo();
ownerCarPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
ownerCarPo.setCarId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_carId));
--
Gitblit v1.8.0