Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

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

@@ -316,7 +316,9 @@
                num = 1D / achieveNewList.size();
            }

            achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
            if (CollUtil.isNotEmpty(achieveNewList)) {
                achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
            }
        }

    }
@@ -357,7 +359,7 @@

    private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
        BusParameterSettings shopManageJjcpasConsume =null;
        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
        if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
            achieveNew.setId(null);
            achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
            achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());