新增赠送项目是否计算消耗控制

jyy

2021-06-12 393d296e43f0e5f11e524cab5446bcd3eee94e89

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

@@ -172,6 +172,10 @@
        // 下单人是否计算消耗业绩
        boolean flag = projServicesService.skipServiceOrderStep(Dictionary.SALE_MAN_IS_CONSUME_ACHIEVE);

        //赠送项目是否计算消耗业绩
        boolean zsConsumeAchieve = projServicesService.skipServiceOrderStep(Dictionary.ZS_CONSUME_ACHIEVE);


        for (SysBeauticianState beauticianState : beauticianStateList) {
            // 是否第一次计算改美疗师
            boolean isFirst = true;
@@ -183,10 +187,20 @@
            achieveNew.setVipId(projServices.getVipId());
            // 是否为赠送业绩
            if (Dictionary.TAOCAN_SOURCE_ZS.equals(projUse.getSource())) {
                achieveNew.setFreeConsume(projUse.getPrice()*beauticianState.getCount());
                //计算提成
                achieveNew.setProjPercentage(
                        calculationProjPercentage(AchieveRuleItem.ACHIEVE_TYPE_ZS,achieveNew.getFreeConsume(),beauticianState.getProjId()));

                if(zsConsumeAchieve){
                    achieveNew.setFreeConsume(projUse.getPrice()*beauticianState.getCount());
                    //计算提成
                    achieveNew.setProjPercentage(
                            calculationProjPercentage(AchieveRuleItem.ACHIEVE_TYPE_ZS,achieveNew.getFreeConsume(),beauticianState.getProjId()));
                }else{
                    continue;
                }





            } else {
                achieveNew.setHisConsume(projUse.getPrice()*beauticianState.getCount());
                //计算提成
@@ -202,6 +216,7 @@
            achieveNew.setCompanyId(projServices.getCompanyId());
            achieveNew.setShoppingGoodsId(projUse.getProjId());


            if (flag) {
//                if (!achieveId.equals(beauticianState.getStaffId())) {
                    AchieveNew saleManAchieve = new AchieveNew();