优化订单业绩

jyy

2021-03-04 4dab41eef4ffde0c2631fbc7147cd2eee3cd0780

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

@@ -154,7 +154,7 @@


    @Override
    public void addAchieveByServiceOrder(SysProjServices projServices) {
    public void     addAchieveByServiceOrder(SysProjServices projServices) {
        List<AchieveNew> achieveNewList = new ArrayList<>();
        List<SysBeauticianState> beauticianStateList = sysBeauticianStateDao.selectBySerIds(projServices.getId());
        int size = beauticianStateList.size();
@@ -172,20 +172,17 @@
            achieveNew.setVipId(projServices.getVipId());
            // 是否为赠送业绩
            if (Dictionary.TAOCAN_SOURCE_ZS.equals(projUse.getSource())) {
                achieveNew.setFreeConsume(projUse.getPrice());
                achieveNew.setFreeConsume(projUse.getPrice()*beauticianState.getCount());
            } else {
                achieveNew.setHisConsume(projUse.getPrice());
                achieveNew.setHisConsume(projUse.getPrice()*beauticianState.getCount());
            }
            achieveNew.setT2(projUse.getSource());
            if (projServices.getCreateTime() != null) {
                achieveNew.setDatatime(projServices.getCreateTime());
            } else {
                achieveNew.setDatatime(new Date());
            }
            achieveNew.setDatatime(new Date());
            achieveNew.setOrderType(Dictionary.ORDER_TYPE_SERVICE);
            achieveNew.setServiceOrderId(projServices.getId());
            achieveNew.setOrderItemId(beauticianState.getId());
            achieveNew.setShopId(projServices.getShopId());
            achieveNew.setCompanyId(projServices.getCompanyId());
            achieveNew.setShoppingGoodsId(projUse.getProjId());
            achieveNew.setNumberOfPeople(1D / size);
            achieveNew.setProjNum(1);
@@ -216,23 +213,15 @@
        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);
                        }
                    }
                } else {
                    // 如果该订单明细没有设置美疗师则单独设置顾问业绩
                    AchieveNew achieveNew = new AchieveNew();
                    // 顾问业绩等于收款金额
                    achieveNew.setT1(orderItem.getPayMoney() + "");
                    buildAchieve(pageOrder, orderItem, achieveNew);
                    // 新增顾问业绩
                    achieveNewList.add(achieveNew);
                }
            }
        }
@@ -245,13 +234,17 @@
    ShoppingGoodsDao shoppingGoodsDao;

    private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
            achieveNew.setId(null);
            achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
            achieveNew.setT1((0 - Double.parseDouble(achieveNew.getT1())) + "");
        }

        achieveNew.setVipId(pageOrder.getVipId());
        achieveNew.setSaleId(pageOrder.getStaffId());

        if (pageOrder.getOrderTime() != null) {
            achieveNew.setDatatime(pageOrder.getOrderTime());
        } else if (pageOrder.getOrderTime() != null) {
            achieveNew.setDatatime(pageOrder.getOrderTime());
        if (pageOrder.getPayTime() != null) {
            achieveNew.setDatatime(pageOrder.getPayTime());
        } else {
            achieveNew.setDatatime(new Date());
        }
@@ -259,17 +252,10 @@
        achieveNew.setOrderId(pageOrder.getId());
        achieveNew.setOrderItemId(orderItem.getId());
        achieveNew.setShopId(pageOrder.getShopId());
        achieveNew.setCompanyId(pageOrder.getCompanyId());
        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
@@ -315,17 +301,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);