From 380908e868b088d62c0e572457bffeea1cbfe8f8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 23 二月 2023 02:51:45 +0800
Subject: [PATCH] 优化加入智能水电表厂家
---
service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 12 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 025eb50..6b18de2 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,20 +15,29 @@
*/
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;
import com.java110.core.event.cmd.CmdEvent;
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.parkingCouponCar.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;
@@ -39,6 +48,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -71,19 +81,22 @@
@Autowired
private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
+ @Autowired
+ private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarV1InnerServiceSMO parkingCouponCarV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingCouponCarOrderV1InnerServiceSMO parkingCouponCarOrderV1InnerServiceSMOImpl;
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
Assert.hasKeyAndValue(reqJson, "machineId", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
Assert.hasKeyAndValue(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈杞︾墝鍙�");
Assert.hasKeyAndValue(reqJson, "type", "璇锋眰鎶ユ枃涓湭鍖呭惈绫诲瀷");
-
- if("1101".equals(reqJson.getString("type"))) {
- return;
- }
-
- Assert.hasKeyAndValue(reqJson,"payType","鏈寘鍚敮浠樻柟寮�");
- Assert.hasKeyAndValue(reqJson,"amount","鏈寘鍚敮浠橀噾棰�");
CarInoutDto carInoutDto = new CarInoutDto();
carInoutDto.setCarNum(reqJson.getString("carNum"));
@@ -93,9 +106,27 @@
});
int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
- if(count < 1){
- throw new CmdException("杞﹁締鏈叆鍦�");
+ //鍑哄満
+ if(!"1101".equals(reqJson.getString("type"))) {
+ Assert.hasKeyAndValue(reqJson,"payType","鏈寘鍚敮浠樻柟寮�");
+ Assert.hasKeyAndValue(reqJson,"amount","鏈寘鍚敮浠橀噾棰�");
+ if(count < 1){
+ throw new CmdException("杞﹁締鏈叆鍦�");
+ }
+ }else{
+ if(count > 0){
+ throw new CmdException("杞﹁締宸茬粡鍦ㄥ満锛岃鍏堝嚭鍦�");
+ }
+ //杩涘満鏃� 鍒ゆ柇鏄惁涓洪粦鍚嶅崟
+ CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
+ carBlackWhiteDto.setCarNum(reqJson.getString("carNum"));
+ count = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhitesCount(carBlackWhiteDto);
+ if(count > 0){
+ throw new CmdException("榛戝悕鍗曡溅杈嗙姝㈠叆鍦�");
+ }
}
+
+
}
@@ -113,17 +144,70 @@
if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size()< 1){
throw new CmdException("鏈寘鍚仠杞﹀満淇℃伅");
}
-
TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
tempCarPayOrderDto.setPaId(parkingBoxAreaDtos.get(0).getPaId());
- tempCarPayOrderDto.setOrderId(reqJson.getString("inoutId"));
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.getTempCarFeeOrder(tempCarPayOrderDto);
+ if(resultVo.getCode() != ResultVo.CODE_OK){
+ throw new CmdException(resultVo.getMsg());
+ }
+ 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"));
+ tempCarPayOrderDto.setPaId(parkingBoxAreaDtos.get(0).getPaId());
+ tempCarPayOrderDto.setOrderId(orderInfo.getString("orderId"));
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 resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
+ resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
+ if(resultVo.getCode() != ResultVo.CODE_OK){
+ throw new CmdException(resultVo.getMsg());
+ }
}
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