beauty-erp.git - Gitblit

			@@ -26,6 +26,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.math.BigDecimal;
			import java.util.*;

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




			for (SysBeauticianState beauticianState : beauticianStateList) {
			// 是否第一次计算改美疗师
			boolean isFirst = true;
			@@ -183,12 +187,14 @@
			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()));

			} else {
			achieveNew.setHisConsume(projUse.getPrice()*beauticianState.getCount());
			achieveNew.setHisConsume(new BigDecimal(projUse.getPrice()*beauticianState.getCount()).setScale(2, BigDecimal.ROUND_HALF_DOWN).doubleValue());
			//计算提成
			achieveNew.setProjPercentage(
			calculationProjPercentage(AchieveRuleItem.ACHIEVE_TYPE_BJ,achieveNew.getHisConsume(),beauticianState.getProjId()));
			@@ -202,6 +208,7 @@
			achieveNew.setCompanyId(projServices.getCompanyId());
			achieveNew.setShoppingGoodsId(projUse.getProjId());


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