费用初始化添加折扣金额以及折扣记录0822

chengf

2025-08-22 f4d855f8d2d5cd52c0831e690dcb12e700b91eb1

 service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java

@@ -10,6 +10,8 @@
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.user.UserDownloadFileDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
import com.java110.po.car.CarInoutFeeHistoryPo;
import com.java110.po.car.CarInoutPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
@@ -19,7 +21,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.text.ParseException;
import java.util.List;

@@ -28,6 +32,8 @@

    @Autowired
    private ICarInoutInnerServiceSMO iCarInoutInnerServiceSMOImpl;
    @Resource
    private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -42,6 +48,14 @@
            carInoutDto.setTotal(i);
            carInoutDto.setRecords((int) Math.ceil((double) i / (double) reqJson.getInteger("row")));
            List<ApiCarInoutDataVo> carInoutDtos = iCarInoutInnerServiceSMOImpl.queryCarInouts2(carInoutDto);
            for(ApiCarInoutDataVo apiCarInoutDataVo : carInoutDtos){
                CarInoutFeeHistoryPo carInoutFeeHistoryPo = new CarInoutFeeHistoryPo();
                carInoutFeeHistoryPo.setInoutId(apiCarInoutDataVo.getInoutId());
                List<CarInoutFeeHistoryPo> list = carInoutV1InnerServiceSMOImpl.queryCarInoutFeeHistoryList(carInoutFeeHistoryPo);
                if(!CollectionUtils.isEmpty(list)){
                    apiCarInoutDataVo.setCarInoutFeeHistory(list.get(0));
                }
            }
            i = carInoutDtos.size();
            ApiCarInoutVo carInoutVo = new ApiCarInoutVo();