fix: 修改字段

yanghb

2025-04-25 39854ed874e1f38ce3f192ca8e0362a826cfdd55

 cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/CompensateServiceImpl.java

@@ -181,7 +181,7 @@
    public boolean compensateBuyCalculateV2(
            Date time, String street,
            BigDecimal orgArea,BigDecimal noOrgArea,
            BigDecimal compensationNewAmount,BigDecimal compensationOldAmount,
            String compensationNewAmount,String compensationOldAmount,
            BigDecimal money
    ) {
        List<Compensate> compensates = this.list();
@@ -193,26 +193,26 @@
        //14年之前
        if (time.before(date)) {
            if ("崇阳街道、崇庆街道、羊马街道、大划街道".contains(street)) {
                if (compensationNewAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationNewAmount)) {
                    //14年之前 专属街道 集体 新建房
                    orgPrice = configMap.get(CompensateEnum.BEFORE_BUY_ORG_APPOINT1.getCode());
                    //14年之前 专属街道 非集体 新建房
                    noOrgPrice = configMap.get(CompensateEnum.BEFORE_BUY_NO_ORG_APPOINT1.getCode());
                }
                if (compensationOldAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationOldAmount)) {
                    //14年之前 专属街道 集体 二手房
                    orgPrice = configMap.get(CompensateEnum.BEFORE_BUY_ORG_APPOINT2.getCode());
                    //14年之前 专属街道 非集体 二手房
                    noOrgPrice = configMap.get(CompensateEnum.BEFORE_BUY_NO_ORG_APPOINT2.getCode());
                }
            } else {
                if (compensationNewAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationNewAmount)) {
                    //14年之前 其余街道 集体 新建房
                    orgPrice = configMap.get(CompensateEnum.BEFORE_BUY_ORG_OTHER1.getCode());
                    //14年之前 其余街道 非集体 新建房
                    noOrgPrice = configMap.get(CompensateEnum.BEFORE_BUY_NO_ORG_OTHER1.getCode());
                }
                if (compensationOldAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationOldAmount)) {
                    //14年之前 其余街道 集体 二手房
                    orgPrice = configMap.get(CompensateEnum.BEFORE_BUY_ORG_OTHER2.getCode());
                    //14年之前 其余街道 非集体 二手房
@@ -221,26 +221,26 @@
            }
        }else{
            if ("崇阳街道、崇庆街道、羊马街道、大划街道".contains(street)) {
                if (compensationNewAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationNewAmount)) {
                    //14年之前 专属街道 集体 新建房
                    orgPrice = configMap.get(CompensateEnum.AFTER_BUY_ORG_APPOINT1.getCode());
                    //14年之前 专属街道 非集体 新建房
                    noOrgPrice = configMap.get(CompensateEnum.AFTER_BUY_NO_ORG_APPOINT1.getCode());
                }
                if (compensationOldAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationOldAmount)) {
                    //14年之前 专属街道 集体 二手房
                    orgPrice = configMap.get(CompensateEnum.AFTER_BUY_ORG_APPOINT2.getCode());
                    //14年之前 专属街道 非集体 二手房
                    noOrgPrice = configMap.get(CompensateEnum.AFTER_BUY_NO_ORG_APPOINT2.getCode());
                }
            } else {
                if (compensationNewAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationNewAmount)) {
                    //14年之前 其他街道 集体 新建房
                    orgPrice = configMap.get(CompensateEnum.AFTER_BUY_ORG_OTHER1.getCode());
                    //14年之前 其他街道 非集体 新建房
                    noOrgPrice = configMap.get(CompensateEnum.AFTER_BUY_NO_ORG_OTHER1.getCode());
                }
                if (compensationOldAmount.compareTo(BigDecimal.ZERO) > 0) {
                if (ObjUtil.isNotEmpty(compensationOldAmount)) {
                    //14年之前 其他街道 集体 二手房
                    orgPrice = configMap.get(CompensateEnum.AFTER_BUY_ORG_OTHER2.getCode());
                    //14年之前 其他街道 非集体 二手房