zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
@@ -572,4 +572,5 @@ String SERVICE_OVER_BEGIN_END = "SERVICE_OVER_BEGIN_END"; String SALE_MAN_IS_CONSUME_ACHIEVE = "SALE_MAN_IS_CONSUME_ACHIEVE"; String ZS_CONSUME_ACHIEVE = "ZS_CONSUME_ACHIEVE"; } 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(); zq-erp/src/main/resources/config/prd/application.properties
@@ -2,13 +2,10 @@ server.port=8080 #spring.datasource.username=hive #spring.datasource.password=hive123!@# #spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.username=hive spring.datasource.password=hive123!@# spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
@@ -574,15 +574,15 @@ select #{item.beginTime} time, (select ifnull(sum(ifnull(card_cash,0) + ifnull(consume,0)),0) from achieve_new a where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) orderAmount, (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0) (select ifnull(sum(case a.pay_method when '现金' then goods_cash else 0 end),0) from achieve_new a inner join sys_order_item b on a.order_item_id=b.ID where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cashAmount, (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0) (select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0) from achieve_new a inner join sys_order_item b on a.order_item_id=b.ID where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardAmount, (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0) (select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0) from achieve_new a inner join sys_order_item b on a.order_item_id=b.ID where a.beault_id=#{userId} and <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]>) cardUseAmount, @@ -615,7 +615,7 @@ <select id="selectStaffCashAchieve" resultType="java.util.TreeMap"> select <foreach collection="list" index="index" item="item" separator="," > (select ifnull(sum(case b.pay_method when '现金' then goods_cash else 0 end),0) (select ifnull(sum(case a.pay_method when '现金' then goods_cash else 0 end),0) from achieve_new a inner join sys_order_item b on a.order_item_id=b.ID where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]> @@ -630,7 +630,7 @@ <select id="selectStaffCardAchieve" resultType="java.util.TreeMap"> select <foreach collection="list" index="index" item="item" separator="," > (select ifnull(sum(case b.pay_method when '划扣' then goods_cash else 0 end),0) (select ifnull(sum(case a.pay_method when '划扣' then goods_cash else 0 end),0) from achieve_new a inner join sys_order_item b on a.order_item_id=b.ID where <![CDATA[datatime > #{item.beginTime} and datatime < #{item.endTime} ]]> zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -6,6 +6,7 @@ import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.common.dao.SysCompanyDao; import com.matrix.system.constance.Dictionary; import com.matrix.system.hive.bean.ParameterSettings; import com.matrix.system.hive.dao.ParameterSettingsDao; import org.junit.Test; @@ -82,6 +83,13 @@ newSetting5.setCategory("微商城配置"); newSettings.add(newSetting5); ParameterSettings newSetting6=new ParameterSettings(); newSetting6.setCode(Dictionary.ZS_CONSUME_ACHIEVE); newSetting6.setName("赠送项目是否计算消耗业绩"); newSetting6.setType(1); newSetting6.setCategory("店务配置"); newSettings.add(newSetting6); for (ParameterSettings newSetting : newSettings) { List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);
