Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 service-fee/src/main/java/com/java110/fee/tempCar/BasicComputeTempCarFeeImpl.java

@@ -3,8 +3,8 @@
import com.java110.core.factory.TempCarFeeFactory;
import com.java110.dto.fee.TempCarFeeResult;
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigAttrDto;
import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
import com.java110.dto.fee.TempCarFeeConfigAttrDto;
import com.java110.dto.fee.TempCarFeeConfigDto;
import org.springframework.stereotype.Component;

import java.math.BigDecimal;
@@ -33,7 +33,7 @@
    public static final String SPEC_CD_5600012005 = "5600012005";
    public static final String SPEC_CD_5600012006 = "5600012006";
    public static final String SPEC_CD_5600012007 = "5600012007";
    public static final String SPEC_CD_5600012008 = "5600012006";
    public static final String SPEC_CD_5600012008 = "5600012008";
    public static final String SPEC_CD_5600012009 = "5600012009";

    @Override
@@ -42,7 +42,7 @@


        //获取停车时间
        long min = TempCarFeeFactory.getTempCarMin(carInoutDto);
        long min = TempCarFeeFactory.getTempCarCeilMin(carInoutDto);

        int freeMin = TempCarFeeFactory.getAttrValueInt(tempCarFeeConfigAttrDtos, SPEC_CD_5600012001);

@@ -52,7 +52,7 @@
        double baseMoney = 0.0;

        //免费时间中
        if (min < freeMin && !TempCarFeeFactory.judgeFinishPayTempCarFee(carInoutDto)) {
        if (min <= freeMin && !TempCarFeeFactory.judgeFinishPayTempCarFee(carInoutDto)) {
            return new TempCarFeeResult(carInoutDto.getCarNum(), 0.0, maxFeeMoney, baseMoney);
        }