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

935090232@qq.com

2021-01-06 33d82cdff305ce4cb784638edc258b7bb8397353

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -80,6 +80,7 @@
        queryUse.setVipId(serviceVipProjDto.getVipId());
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        if (serviceVipProjDto.getType() != null) {
        switch (serviceVipProjDto.getType()) {
            case "0" :
                break;
@@ -99,6 +100,11 @@
                queryUse.setIsOver(Dictionary.FLAG_NO_N);
                break;
        }
        } else {
            queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
            queryUse.setIsOver(Dictionary.FLAG_NO_N);
        }

        queryUse.setQueryKey(serviceVipProjDto.getQueryKey());
        List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
        List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);