modify

Helius

2021-03-15 7e08f7cd8079fa3b9f276aca7140b0afdb3d144d

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

@@ -190,12 +190,13 @@
                achieveNew.setProjPercentage(Double.parseDouble(beauticianState.getExtract()));
            }
            if (isFirst && beauticianState.getEndTime() != null && beauticianState.getBeginTime() != null) {
                long timeSpace = beauticianState.getEndTime().getTime() - beauticianState.getBeginTime().getTime();
                if (timeSpace > 0) {
                    achieveNew.setProjTime((int) (timeSpace / 1000 / 60));
                } else {
                    achieveNew.setProjTime(1);
                }
//                long timeSpace = beauticianState.getEndTime().getTime() - beauticianState.getBeginTime().getTime();
//                if (timeSpace > 0) {
//                    achieveNew.setProjTime((int) (timeSpace / 1000 / 60));
//                } else {
//                    achieveNew.setProjTime(1);
//                }
                achieveNew.setProjTime(beauticianState.getExcTime());
                isFirst = false;
            }
            achieveNewList.add(achieveNew);
@@ -213,10 +214,10 @@
        if (CollectionUtils.isNotEmpty(pageOrder.getItems())) {
            for (SysOrderItem orderItem : pageOrder.getItems()) {

                if (orderItem != null && CollectionUtils.isNotEmpty(orderItem.getAchaeveList())) {
                if (orderItem != null && CollectionUtils.isNotEmpty(orderItem.getAchieveList())) {

                    for (AchieveNew achieveNew : orderItem.getAchaeveList()) {
                        if (achieveNew !=null   && achieveNew.getT1()!=null) {
                    for (AchieveNew achieveNew : orderItem.getAchieveList()) {
                        if (achieveNew !=null   && achieveNew.getGoodsCash()!=null) {
                            buildAchieve(pageOrder,  orderItem, achieveNew);
                            // 新增美疗师业绩
                            achieveNewList.add(achieveNew);
@@ -237,7 +238,7 @@
        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
            achieveNew.setId(null);
            achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
            achieveNew.setT1((0 - Double.parseDouble(achieveNew.getT1())) + "");
            achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());
        }

        achieveNew.setVipId(pageOrder.getVipId());
@@ -256,14 +257,6 @@
        achieveNew.setShoppingGoodsId(orderItem.getGoodsId());
        // 是否赠送
        achieveNew.setT2(orderItem.getIsFree());
        // 根据商品类型设置业绩类型

        if (Dictionary.ACHIEVE_TYPE_CASH.equals(achieveNew.getT3())){
            achieveNew.setCardCash(Double.parseDouble(achieveNew.getT1()));
        } else {
            // 设置划扣金额
            achieveNew.setConsume(Double.parseDouble(achieveNew.getT1()));
        }
    }

    @Override
@@ -309,17 +302,17 @@
            // 本日
            case 1 :
                break;
                // 昨日
            // 昨日
            case 2:
                startTime = DateUtil.previousNDate(startTime, 1);
                endTime = startTime;
                break;
                // 本月
            // 本月
            case 3:
                calendar.set(Calendar.DAY_OF_MONTH, 1);
                startTime = calendar.getTime();
                break;
                // 上月
            // 上月
            case 4:
                calendar.add(Calendar.MONTH, -1);
                calendar.set(Calendar.DAY_OF_MONTH, 1);