优化diamante

Your Name

2023-08-26 7958f1dddb8a7f4e70d232b07a7703955ecedae0

 service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentSummaryCmd.java

@@ -21,7 +21,7 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
import com.java110.dto.payment.CarInoutPaymentDto;
import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -62,7 +62,12 @@
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
        if(reqJson.containsKey("boxId")) {
            Assert.hasKeyAndValue(reqJson, "boxId", "未包含岗亭信息");
        }else{
            Assert.hasKeyAndValue(reqJson, "paId", "未包含停车场");

        }
    }

    @Override
@@ -70,6 +75,7 @@

        CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
        carInoutPaymentDto.setBoxId(reqJson.getString("boxId"));
        carInoutPaymentDto.setPaId(reqJson.getString("paId"));

        if(StringUtil.isEmpty(carInoutPaymentDto.getStartTime())){
            Calendar calendar = Calendar.getInstance();
@@ -77,7 +83,10 @@
            carInoutPaymentDto.setStartTime(DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_B));
        }
        if(StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
            carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B));
            carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(new Date(),1));
        }else{
            Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
            carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
        }
        List<CarInoutPaymentDto> carInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentSummary(carInoutPaymentDto);