小程序支付0828

chengf

2025-08-28 12c73520fea569d1b716ec81a4944d96967a75b7

 service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java

@@ -15,6 +15,7 @@
import com.java110.dto.room.RoomDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.fee.api.FeeDiscountApi;
import com.java110.fee.cmd.fee.PayFeeCmd;
import com.java110.fee.cmd.fee.PayFeePreCmd;
import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
@@ -82,7 +83,7 @@
    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;

    @Autowired
    private PayFeePreCmd payFeePreCmd;
    private PayFeeCmd payFeeCmd;

    @Autowired
    private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@@ -406,10 +407,8 @@
        for (FeeDto tmpFeeDto : feeDtos) {
            if(DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime() > tmpFeeDto.getMaxEndTime().getTime()){
                throw new IllegalArgumentException("该费用记录结束时间大于费用记录最大缴费时间");
            }else if(importRoomFee.getStartTime().split(" ")[0].equals(tmpFeeDto.getEndTime().toString())){
            }else {
                doImportFeeDetail(tmpFeeDto, importRoomFee);
            }else{
                throw new IllegalArgumentException("请对改费用记录进行拆分处理");
            }
        }

@@ -457,7 +456,6 @@
        if (count > 0) {
            throw new IllegalStateException("重复的缴费记录");
        }

        PayFeeDetailDiscountPo payFeeDetailDiscount = new PayFeeDetailDiscountPo();
        try {
            Map feePriceAll = computeFeeSMOImpl.getFeePrice(tmpFeeDto);
@@ -529,7 +527,7 @@
            return;
        }

        double computeFee = computeFee(feeInfo,importRoomFee);
//        double computeFee = computeFee(feeInfo,importRoomFee);

        //如果结束时间小于 缴费结束时间则延期
        PayFeePo payFeePo = new PayFeePo();
@@ -540,6 +538,14 @@

        if (arr.length >= 2 && arr[1].equals("23:59:59")){
            payFeePo.setEndTime(DateUtil.getNextSecTime(importRoomFee.getEndTime()));
            if(!(FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag()))){
                importRoomFee.setCycle((DateUtil.dayCompare(
                        DateUtil.getDateFromStringA(importRoomFee.getStartTime()),
                        DateUtil.getDateFromStringA(importRoomFee.getEndTime())
                ))+"");
                payFeeCmd.ifCustomStartEndTimePayFee(importRoomFee.getCycle(), feeInfo.getEndTime(), feeDtos.get(0) , feeInfo, importRoomFee.getStartTime());
            }

        }
        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            payFeePo.setState(FeeDto.STATE_FINISH);