Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 0649fb5e05730a8f8bf15b0fe019a7227361f1af

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

@@ -567,9 +567,9 @@
            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();
                }
                cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();

            }
        }