Merge branch 'score_shop' into api_score_meger

jyy

2021-08-02 b72820410a7989da5c645bedb849dc7cccb8faed

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

@@ -1239,10 +1239,17 @@
            //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
            boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
            if(zsConsumeAchieve){
                if (taocanId == null) {
                    puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
                } else {
                    puse.setPrice(goodsAssemble.getPrice());
                if(sysOrderItem.getPrice()>0){

                    //大于0 不修改金额

                }else{
                    //等于0取原价
                    if (taocanId == null) {
                        puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
                    } else {
                        puse.setPrice(goodsAssemble.getPrice());
                    }
                }
            }else{
                puse.setPrice(0D);