优化代码

wuxw

2022-01-15 e3aed650aa4e232f4583a00fc3de088276a2188b

 java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -1,5 +1,7 @@
package com.java110.core.smo.impl;

import com.java110.config.properties.code.Java110Properties;
import com.java110.core.context.Environment;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
@@ -84,6 +86,9 @@

    @Autowired(required = false)
    private ITempCarFeeConfigAttrInnerServiceSMO tempCarFeeConfigAttrInnerServiceSMOImpl;

    @Autowired
    private Java110Properties java110Properties;

    @Override
    public Date getFeeEndTime() {
@@ -904,6 +909,9 @@
        BigDecimal feePrice = new BigDecimal("0.0");
        BigDecimal feeTotalPrice = new BigDecimal(0.0);
        Map<String, Object> feeAmount = new HashMap<>();
        if(Environment.isOwnerPhone(java110Properties)){
            return getOwnerPhoneFee(feeAmount);
        }
        if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //房屋相关
            String computingFormula = feeDto.getComputingFormula();
            if (roomDto == null) {
@@ -1235,6 +1243,7 @@
                throw new IllegalArgumentException("暂不支持该类公式");
            }
        }

        feePrice.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
        feeAmount.put("feePrice", feePrice);
        feeAmount.put("feeTotalPrice", feeTotalPrice);
@@ -1525,6 +1534,16 @@
        return resMonth;
    }


    public Map getOwnerPhoneFee(Map feeAmount){
        if(Environment.testEnv()){
            feeAmount.put("feePrice",new BigDecimal("0.01"));
            feeAmount.put("feeTotalPrice", new BigDecimal("0.01"));
        }
        return feeAmount;
    }


    /**
     * 　　 *字符串的日期格式的计算
     */