From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
index 99a4565..67037cc 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
@@ -15,10 +15,9 @@
*/
package com.java110.common.cmd.machine;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
-import com.java110.common.dao.ICarBlackWhiteServiceDao;
-import com.java110.common.dao.ICarInoutV1ServiceDao;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
@@ -26,15 +25,19 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.machine.CarBlackWhiteDto;
import com.java110.dto.machine.CarInoutDto;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
+import com.java110.dto.parkingCoupon.ParkingCouponCarDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.intf.acct.IParkingCouponCarOrderV1InnerServiceSMO;
+import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.user.ICarBlackWhiteV1InnerServiceSMO;
+import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
+import com.java110.po.parkingCouponCarOrder.ParkingCouponCarOrderPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -42,6 +45,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -76,6 +80,13 @@
@Autowired
private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarV1InnerServiceSMO parkingCouponCarV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarOrderV1InnerServiceSMO parkingCouponCarOrderV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -137,8 +148,9 @@
if(resultVo.getCode() != ResultVo.CODE_OK){
throw new CmdException(resultVo.getMsg());
}
-
- JSONObject orderInfo = JSONObject.parseObject(resultVo.getData().toString());
+ String data = JSONObject.toJSONString(resultVo.getData());
+ JSONObject orderInfo = JSONObject.parseObject(data);
+ //JSONObject orderInfo = JSONObject.parseObject(resultVo.getData().toString());
tempCarPayOrderDto = new TempCarPayOrderDto();
tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
@@ -147,6 +159,8 @@
tempCarPayOrderDto.setAmount(Double.parseDouble(reqJson.getString("amount")));
tempCarPayOrderDto.setPayCharge(Double.parseDouble(reqJson.getString("payCharge")));
tempCarPayOrderDto.setPayType(reqJson.getString("payType"));
+ //澶勭悊浼樻儬鍒�
+ dealParkingCouponCar(reqJson,tempCarPayOrderDto);
//tempCarPayOrderDto.setMachineId(reqJson.getString("machineId"));
resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
if(resultVo.getCode() != ResultVo.CODE_OK){
@@ -156,4 +170,41 @@
ResponseEntity<String> responseEntity = machineOpenDoorBMOImpl.customCarInOut(reqJson);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void dealParkingCouponCar(JSONObject reqJson,TempCarPayOrderDto tempCarPayOrderDto) {
+ //澶勭悊鍋滆溅鍔�
+
+ if(!reqJson.containsKey("pccIds")) {
+ return ;
+ }
+
+ JSONArray pccIds = reqJson.getJSONArray("pccIds");
+ ParkingCouponCarPo parkingCouponCarPo = null;
+ ParkingCouponCarOrderPo parkingCouponCarOrderPo = null;
+ String pccId = "";
+ List<String> tmpPccIds = new ArrayList<>();
+ for(int pccIndex = 0;pccIndex < pccIds.size();pccIndex++){
+ pccId = pccIds.getString(pccIndex);
+ tmpPccIds.add(pccId);
+ 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("-1");
+ parkingCouponCarOrderPo.setCommunityId(reqJson.getString("communityId"));
+ parkingCouponCarOrderPo.setMachineId(StringUtil.isEmpty(reqJson.getString("machineId"))?"-1":reqJson.getString("machineId"));
+ parkingCouponCarOrderPo.setMachineName("鏈煡");
+ parkingCouponCarOrderPo.setPaId(reqJson.getString("paId"));
+ parkingCouponCarOrderPo.setPccId(pccId);
+ parkingCouponCarOrderPo.setRemark("pc绔敮浠樺仠杞﹀姷鎶垫墸");
+
+ parkingCouponCarOrderV1InnerServiceSMOImpl.saveParkingCouponCarOrder(parkingCouponCarOrderPo);
+ }
+
+ tempCarPayOrderDto.setPccIds(tmpPccIds.toArray(new String[tmpPccIds.size()]));
+ }
}
--
Gitblit v1.8.0