修改积分bug

935090232@qq.com

2021-04-20 af7e34c06f2c9775e4c2fee95009df903f1b6efe

修改积分bug

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -552,15 +552,23 @@
                &&StringUtils.isNotBlank(cashConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue());
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
            cashScore[0]= cashPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(cashConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1());
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0){
                cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
                }

            }

            if(StringUtils.isNotBlank(cashConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2());
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0){
                    cashScore[1]= cashPayAmount.divide(scoreSetting2).intValue();
                }
                cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
            }
        }
@@ -577,16 +585,22 @@
                &&StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue());
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
            cardScore[0]= cardPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1());
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
                cardScore[1]= cardPayAmount.divide(scoreSetting1).intValue();
                }
            }

            if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2());
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
                cardScore[2]= cardPayAmount.divide(scoreSetting2).intValue();
                }
            }
        }

@@ -601,18 +615,24 @@
                &&StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())){

            BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue());
            if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
            giftScore[0]= giftPayAmount.divide(scoreSetting0).intValue();
            }

            if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())){
                BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1());
                if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
                giftScore[1]= giftPayAmount.divide(scoreSetting1).intValue();
                }
            }

            if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())){
                BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2());
                if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
                giftScore[2]= giftPayAmount.divide(scoreSetting2).intValue();
            }
        }
        }

        int selfScore=cashScore[0]+cardScore[0]+giftScore[0];
        int parentScore=cashScore[1]+cardScore[1]+giftScore[1];