From 4e12aa79fa3affb0d0dc3e5f9d368814702f8d2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 31 三月 2023 16:22:14 +0800
Subject: [PATCH] optimize owner member
---
service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
index e4d5b28..6fcf98e 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
@@ -21,13 +21,16 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
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 com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -63,24 +66,36 @@
@Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+ @Autowired
+ private ICarInoutPaymentV1InnerServiceSMO carInoutPaymentV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
- Assert.hasKeyAndValue(reqJson, "paId", "鏈寘鍚仠杞﹀満淇℃伅");
+ if(reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
+ Assert.hasKeyAndValue(reqJson, "boxId", "鏈寘鍚矖浜俊鎭�");
+ }else{
+ Assert.hasKeyAndValue(reqJson, "paId", "鏈寘鍚仠杞﹀満淇℃伅");
+ }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
carInoutDto.setStates(new String[]{CarInoutDto.STATE_IN, CarInoutDto.STATE_PAY, CarInoutDto.STATE_REPAY});
- carInoutDto.setPaIds(getPaIds(reqJson));
+ if(reqJson.containsKey("boxId")) {
+ carInoutDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutDto.setPaId(reqJson.getString("paId"));
+ }
int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
List<CarInoutDto> carInoutDtos = null;
if (count > 0) {
carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);
+ freshPayTime(carInoutDtos);
carInoutDtos = computeCarInouts(carInoutDtos);
} else {
carInoutDtos = new ArrayList<>();
@@ -93,6 +108,31 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+ /**
+ * 杈撳叆鏈�鏂扮殑鏀粯鏃堕棿
+ * @param carInoutDtos
+ */
+ private void freshPayTime(List<CarInoutDto> carInoutDtos) {
+ for(CarInoutDto carInoutDto : carInoutDtos){
+ if(CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())){
+
+ //鏌ヨ 鏀粯璁板綍 鍒锋柊payTime
+ CarInoutPaymentDto carInoutPaymentDto = new CarInoutPaymentDto();
+ carInoutPaymentDto.setInoutId(carInoutDto.getInoutId());
+ carInoutPaymentDto.setPage(1);
+ carInoutPaymentDto.setRow(1);
+ List<CarInoutPaymentDto> carInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPayments(carInoutPaymentDto);
+
+ if(carInoutPaymentDtos == null || carInoutPaymentDtos.size() < 1){
+ carInoutDto.setPayTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ continue;
+ }
+
+ carInoutDto.setPayTime(carInoutPaymentDtos.get(0).getPayTime());
+ }
+ }
+ }
+
private String[] getPaIds(JSONObject reqJson) {
if (reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
--
Gitblit v1.8.0