From 5fc2fc57afc63a906ec5567e91aeab72d20aab7d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 16 一月 2023 23:17:50 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
index 8e7090a..d312ddf 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
@@ -18,7 +18,7 @@
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.dto.carInoutPayment.CarInoutPaymentDto;
import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
@@ -26,6 +26,7 @@
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
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;
@@ -35,6 +36,7 @@
import org.springframework.http.ResponseEntity;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@@ -49,7 +51,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "carInoutPayment.listCarInoutPayment")
-public class ListCarInoutPaymentCmd extends AbstractServiceCmdListener {
+public class ListCarInoutPaymentCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCarInoutPaymentCmd.class);
@Autowired
@@ -66,7 +68,17 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
- carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+ if(reqJson.containsKey("boxId")) {
+ carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutPaymentDto.setPaId(reqJson.getString("paId"));
+ }
+
+ if(!StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
+ Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
+ carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
+ }
+
int count = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentsCount(carInoutPaymentDto);
List<CarInoutPaymentDto> carInoutPaymentDtos = null;
@@ -77,6 +89,20 @@
carInoutPaymentDtos = new ArrayList<>();
}
+ if(carInoutPaymentDtos != null && carInoutPaymentDtos.size()>0){
+ List<CarInoutPaymentDto> tempCarInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentMarjor(carInoutPaymentDto);
+ for(CarInoutPaymentDto carInoutPaymentDto1: carInoutPaymentDtos){
+ carInoutPaymentDto1.setPayChargeTotal(tempCarInoutPaymentDtos.get(0).getPayChargeTotal());
+ carInoutPaymentDto1.setRealChargeTotal(tempCarInoutPaymentDtos.get(0).getRealChargeTotal());
+ }
+ }else{
+ for(CarInoutPaymentDto carInoutPaymentDto1: carInoutPaymentDtos){
+ carInoutPaymentDto1.setPayChargeTotal("0");
+ carInoutPaymentDto1.setRealChargeTotal("0");
+ }
+ }
+
+
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, carInoutPaymentDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
--
Gitblit v1.8.0