Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 c4f92fc59c25cc7564ff16895ab271c0d04f1e11

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

@@ -1262,11 +1262,19 @@
            //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
            boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
            if(zsConsumeAchieve){
                if(sysOrderItem.getPrice()>0){

                    //大于0 不修改金额

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

            }else{
                puse.setPrice(0D);
            }
@@ -1370,7 +1378,11 @@
            //赠送项目是否计算消耗业绩否则 赠送产品按原价计算消耗
            boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);
            if(zsConsumeAchieve){
                if(sysOrderItem.getPrice()>0){
                    puse.setPrice(sysOrderItem.getZkPrice());
                }else{
                puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
                }
            }else{
                puse.setPrice(0D);
            }