From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
index 34188df..e1c8e64 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/tempCarFee/GetTempCarFeeOrderCmd.java
@@ -1,28 +1,21 @@
package com.java110.fee.cmd.tempCarFee;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.couponUser.CouponUserDto;
-import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
+import com.java110.dto.fee.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.intf.acct.ICouponUserV1InnerServiceSMO;
-import com.java110.utils.cache.CommonCache;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -36,17 +29,33 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "tempCarFee.getTempCarFeeOrder")
-public class GetTempCarFeeOrderCmd extends AbstractServiceCmdListener {
+public class GetTempCarFeeOrderCmd extends Cmd {
@Autowired
private ICouponUserV1InnerServiceSMO couponUserV1InnerServiceSMOImpl;
@Autowired
private IGetTempCarFeeRules getTempCarFeeRulesImpl;
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "paId", "paId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "carNum", "carNum涓嶈兘涓虹┖");
+ if(StringUtil.isEmpty(reqJson.getString("paId"))){
+ Assert.hasKeyAndValue(reqJson, "boxId", "boxId涓嶈兘涓虹┖");
+
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+ parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+ if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size()< 1){
+ throw new CmdException("鏈壘鍒板仠杞﹀満");
+ }
+ reqJson.put("paId",parkingBoxAreaDtos.get(0).getPaId());
+ }
+ Assert.hasKeyAndValue(reqJson, "paId", "paId涓嶈兘涓虹┖");
+
}
@@ -55,6 +64,9 @@
TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
tempCarPayOrderDto.setPaId(reqJson.getString("paId"));
tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
+ if(reqJson.containsKey("pccIds") && !StringUtil.isEmpty(reqJson.getString("pccIds"))){
+ tempCarPayOrderDto.setPccIds(reqJson.getString("pccIds").split(","));
+ }
ResponseEntity<String> responseEntity = getTempCarFeeRulesImpl.getTempCarFeeOrder(tempCarPayOrderDto);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0