Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-07-31 59c430b896ee4577857dc0725bf6a5df4b99e1f7

Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

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

 zq-erp/pom.xml

@@ -497,11 +497,7 @@
        </repository>


        <repository>
            <id>repository.jboss.org-public</id>
            <name>JBoss.org Maven repository</name>
            <url>https://repository.jboss.org/nexus/content/groups/public</url>
        </repository>



    </repositories>

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

@@ -1241,8 +1241,7 @@
            if(zsConsumeAchieve){
                if(sysOrderItem.getPrice()>0){



                    //大于0 不修改金额

                }else{
                    //等于0取原价
@@ -1252,7 +1251,6 @@
                        puse.setPrice(goodsAssemble.getPrice());
                    }
                }

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

                    int sub = sysProjUse.getSurplusCount() - item.getCount();
                    if (sub < 0) {
                      throw new GlobleException("项目余次不足");
                        throw new GlobleException("项目余次不足");
                    }else if(sub==0){
                        sysProjUse.setIsOver(Dictionary.FLAG_YES_Y);
                        sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX);