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

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

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

@@ -198,14 +198,14 @@
            achieveNew.setShoppingGoodsId(projUse.getProjId());

            if (flag) {
                if (!achieveId.equals(beauticianState.getStaffId())) {
//                if (!achieveId.equals(beauticianState.getStaffId())) {
                    AchieveNew saleMan = new AchieveNew();
                    BeanUtils.copyProperties(achieveNew, saleMan);
                    saleMan.setBeaultId(achieveId);

                    saleAchieveNumOfPeople(saleMan);
                    achieveNewList.add(saleMan);
                }
//                }
            }

            List<AchieveNew> beautyList = achieveNewDao.selectBeautyManAchieveList(beauticianState.getStaffId(), projServices.getVipId(), new Date());