Merge branch 'main' of http://172.35.0.216:3000/simplifique/Vendaweb-api

.gitea/workflows/deploy-api.yaml

@@ -1,23 +1,41 @@
-name: Deploy NestJS API
+name: Build (develop) / Promote (main)
-on: [push]
+on:
+  push:
+    branches: [main]
 
 jobs:
   build-and-push-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Login no Harbor
+      - name: Build and Push
         run: |
-          echo "${{ secrets.HARBOR_PASSWORD }}" | docker login 172.35.0.216 -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
+          REGISTRY="172.35.0.216:3000"
+          IMAGE_NAME="$REGISTRY/simplifique/vendaweb-api"
+          SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
 
-      - name: Build e Push
+          echo "${{ secrets.K8S }}" | docker login "$REGISTRY" -u "${{ gitea.actor }}" --password-stdin
+
+          docker build -t "$IMAGE_NAME:$SHA_TAG" -t "$IMAGE_NAME:latest" .
+          docker push "$IMAGE_NAME:$SHA_TAG"
+          docker push "$IMAGE_NAME:latest"
+
+      - name: Update Manifest and Push to Git
         run: |
-          TAG=${{ gitea.sha }}
+          SHA_TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
-          docker build -t 172.35.0.216/library/vendaweb-api:$TAG .
+          IMAGE_NAME="172.35.0.216:3000/simplifique/vendaweb-api"
-          docker tag 172.35.0.216/library/vendaweb-api:$TAG 172.35.0.216/library/vendaweb-api:latest
 
-          docker push 172.35.0.216/library/vendaweb-api:$TAG
+          MANIFEST_FILE="k8s/overlays/prod/deployment-image-digest-patch.yaml"
-          docker push 172.35.0.216/library/vendaweb-api:latest
 
+          sed -i "s|image: $IMAGE_NAME:.*|image: $IMAGE_NAME:$SHA_TAG|g" "$MANIFEST_FILE"
+
+          git config user.name "Gitea Action"
+          git config user.email "actions@simplifiquehc.com.br"
+
+          git add "$MANIFEST_FILE"
+          git commit -m "chore: update image tag to $SHA_TAG [skip ci]"
+          git push origin main

Dockerfile

@@ -1,39 +1,55 @@
-# Estágio 1: Build
+ARG NODE_VERSION=16.20
-FROM node:16-bullseye-slim AS builder
+ARG DEBIAN_VARIANT=bullseye
+
+FROM node:${NODE_VERSION}-${DEBIAN_VARIANT} AS builder
 
 WORKDIR /app
-COPY package*.json ./
-RUN npm install --legacy-peer-deps
-COPY . .
-RUN npm run build
 
-FROM node:16-bullseye-slim
+ARG INSTANTCLIENT_ZIP_URL=https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
-# Instalar dependências do Oracle 
+RUN apt-get update \
-RUN apt-get update && apt-get install -y \
+  && apt-get install -y --no-install-recommends ca-certificates wget unzip libaio1 libnsl2 \
-    libaio1 \
+  && rm -rf /var/lib/apt/lists/* \
-    unzip \
+  && mkdir -p /opt/oracle \
-    wget \
+  && wget -q "${INSTANTCLIENT_ZIP_URL}" -O /opt/oracle/instantclient.zip \
-    && mkdir -p /opt/oracle
+  && unzip -q /opt/oracle/instantclient.zip -d /opt/oracle \
+  && rm /opt/oracle/instantclient.zip \
+  && rm -f /opt/oracle/instantclient_*/ojdbc*.jar \
+           /opt/oracle/instantclient_*/ucp*.jar \
+           /opt/oracle/instantclient_*/xstreams.jar \
+           /opt/oracle/instantclient_*/adrci \
+           /opt/oracle/instantclient_*/genezi \
+           /opt/oracle/instantclient_*/uidrvci \
+  && ln -s "$(ls -d /opt/oracle/instantclient_* | head -n 1)" /opt/oracle/instantclient
 
-# Instalar Oracle Instant Client
-RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/client.zip && \
-    unzip /opt/oracle/client.zip -d /opt/oracle && \
-    rm /opt/oracle/client.zip && \
-    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient
-
-# Configurar o sistema para encontrar as bibliotecas do Oracle
 ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
-RUN echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig
+ENV PATH=/opt/oracle/instantclient:$PATH
+
+COPY package*.json ./
+ENV NPM_CONFIG_LEGACY_PEER_DEPS=true
+RUN npm ci
+
+COPY . .
+RUN npm run build \
+  && npm prune --omit=dev --legacy-peer-deps \
+  && npm cache clean --force
+
+FROM node:${NODE_VERSION}-${DEBIAN_VARIANT}-slim AS runtime
 
 WORKDIR /app
 
-# Copiar apenas o necessário do estágio anterior
+ENV NODE_ENV=production
-COPY --from=builder /app/dist ./dist
+ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
+ENV PATH=/opt/oracle/instantclient:$PATH
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends libaio1 libnsl2 \
+  && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /opt/oracle /opt/oracle
 COPY --from=builder /app/package*.json ./
 COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/dist ./dist
 
-# Variáveis de ambiente padrão para o driver oracledb
+EXPOSE 8065
-ENV OCI_LIB_DIR=/opt/oracle/instantclient
-ENV OCI_INC_DIR=/opt/oracle/instantclient/sdk/include
 
-CMD ["npm", "run", "start:prod"]
+CMD ["node", "dist/main"]

KUBERNETES.md

@@ -1,76 +0,0 @@
-# Documentação do Kubernetes
-
-Este documento descreve a infraestrutura e configuração do Kubernetes para o projeto **Vendaweb-api**, utilizando uma abordagem GitOps com ArgoCD e Kustomize.
-
-## Estrutura de Diretórios e Arquivos
-
-A configuração do Kubernetes está localizada no diretório `k8s/` e segue uma estrutura organizada para facilitar a manutenção e escalabilidade:
-
-```
-k8s/
-├── argocd/                 # Configurações do ArgoCD
-│   └── application-prod.yaml # Definição da Application para o ambiente de produção
-├── base/                   # Recursos base do Kubernetes (Kustomize Base)
-│   ├── configmap.yaml      # ConfigMap base
-│   ├── deployment.yaml     # Deployment base da aplicação
-│   ├── kustomization.yaml  # Arquivo principal do Kustomize Base
-│   ├── secret.yaml         # Secret base
-│   └── service.yaml        # Service base
-└── overlays/               # Sobrescritas para diferentes ambientes (Kustomize Overlays)
-    └── prod/               # Ambiente de produção
-        ├── application-prod.yaml
-        ├── deployment-image-digest-patch.yaml
-        ├── kustomization.yaml
-        └── service-patch.yaml
-```
-
-## Recursos Base (`k8s/base`)
-
-O diretório `base` contém as definições padrão dos recursos que são comuns a todos os ambientes.
-
-### Deployment (`deployment.yaml`)
-
-- **Nome**: `vendaweb-api`
-- **Replicas**: 15 (Configuração base)
-- **Imagem**: `172.35.0.216/library/vendaweb-api:latest`
-- **Porta do Container**: 8065
-- **Resources**:
-  - Requests: CPU 100m, Memory 256Mi
-  - Limits: CPU 500m, Memory 512Mi
-- **Probes**: Liveness, Readiness e Startup probes configurados no endpoint `/v1/health`.
-- **Environment**: Configurações carregadas via ConfigMap e Secret.
-
-### Service (`service.yaml`)
-
-- **Tipo**: ClusterIP
-- **Porta**: 8065 (TCP)
-
-## Ambientes (`k8s/overlays`)
-
-### Produção (`k8s/overlays/prod`)
-
-A sobreposição de produção personaliza a configuração base para o ambiente produtivo.
-
-- **Namespace**: `vendaweb-prod`
-- **Patches**: Aplica modificações específicas (ex: digest da imagem, configurações específicas de serviço) via `kustomization.yaml`.
-
-## Deploy com ArgoCD (`k8s/argocd`)
-
-O deploy é gerenciado pelo ArgoCD, que sincroniza o estado do cluster com o repositório Git.
-
-### Application (`application-prod.yaml`)
-
-- **Nome**: `vendaweb-api-prod`
-- **Namespace do ArgoCD**: `argocd`
-- **Origem (Source)**:
-  - Repositório: `https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git`
-  - Revisão: `main`
-  - Path: `k8s/overlays/prod` (Aponta para o overlay de produção)
-- **Destino (Destination)**:
-  - Cluster: `https://kubernetes.default.svc`
-  - Namespace: `vendaweb-api` (Nota: O patch define `vendaweb-prod`, verifique a consistência)
-- **Sync Policy**: Automatizado com `selfHeal` ativado e criação automática de namespace.
-
----
-
-**Observação**: Certifique-se de que as credenciais do Harbor (`imagePullSecrets`) estejam corretamente configuradas no namespace de destino para permitir o pull da imagem.

WORKFLOWS.md

@@ -14,7 +14,7 @@ Os workflows estão definidos no diretório `.gitea/workflows/`. O principal wor
 
 Este workflow é acionado automaticamente no evento:
 
-- `push`: Em qualquer branch (configuração atual `on: [push]`).
+- `push`: Na branch `main`.
 
 ### Jobs
 
@@ -39,10 +39,13 @@ Este job é responsável por construir a imagem Docker e enviá-la para o regist
 3. **Build e Push**
    - Constrói a imagem Docker da aplicação.
    - Tags geradas:
-     - `172.35.0.216/library/vendaweb-api:$TAG` (onde `$TAG` é o SHA do commit do Gitea `gitea.sha`)
+     - `git.simplifiquehc.com.br/simplifique/vendaweb-api:$TAG` (onde `$TAG` é o SHA curto do commit)
-     - `172.35.0.216/library/vendaweb-api:latest`
+     - `git.simplifiquehc.com.br/simplifique/vendaweb-api:latest`
    - Envia ambas as tags para o registry.
 
+4. **Atualizar Manifest e Push no Git**
+   - Atualiza `k8s/overlays/prod/deployment-image-digest-patch.yaml` para apontar para a tag `$TAG`.
+
 ## Variáveis e Segredos (Secrets)
 
 Para que o workflow funcione corretamente, as seguintes secrets devem estar configuradas nas configurações do repositório no Gitea:

k8s/README.md

@@ -0,0 +1,156 @@
+# Kubernetes Infra (k8s) - vendaweb-api
+
+Este diretorio contem os manifests Kubernetes do `vendaweb-api` usando Kustomize (base + overlays).
+
+## Visao geral
+
+- App: `vendaweb-api` (Deployment + Service)
+- Porta HTTP do container/Service: `8067`
+- Healthcheck usado pelos probes: `GET /v1/health`
+- Config via `ConfigMap` + `Secret` (injetados com `envFrom`)
+- Overlay prod:
+  - Namespace: `vendaweb-prod`
+  - Service: `NodePort` (porta externa `30001`)
+  - Replicas: `15`
+
+## Estrutura
+
+- `k8s/base/`
+  - `deployment.yaml`: deployment padrao (replicas 3), porta 8067, probes `/v1/health`, `imagePullSecrets: gitea-auth`
+  - `service.yaml`: `ClusterIP` expondo 8067
+  - `configmap.yaml`: variaveis nao sensiveis (ex.: Redis/DB host/port)
+  - `secret.yaml`: variaveis sensiveis (ex.: usuario/senha do DB)
+  - `kustomization.yaml`: agrega os recursos do base
+
+- `k8s/overlays/prod/`
+  - `kustomization.yaml`: aplica patches e define `namespace: vendaweb-prod`
+  - `service-patch.yaml`: muda Service para `NodePort` e fixa `nodePort: 30001`
+  - `deployment-prod-patch.yaml`: ajusta `replicas: 15`
+  - `deployment-image-digest-patch.yaml`: sobrescreve a `image:` do container
+
+- `k8s/argocd/application-prod.yaml`
+  - Aplica o overlay `k8s/overlays/prod` via Argo CD
+  - Sync automatizado com `selfHeal` e `prune`
+
+## Portas e acesso
+
+- Dentro do cluster: Service `vendaweb-api:8067`
+- Overlay prod (NodePort): porta externa `30001` (mapeia para `8067`)
+
+Notas:
+
+- O processo Node/Nest escuta em `8067` (ver `src/main.ts`).
+- A variavel `PORT` em `.env` nao e usada pelo bootstrap atual; o k8s esta configurado para 8067.
+
+## Deploy com kubectl/kustomize
+
+Gerar o YAML final (sem aplicar):
+
+```bash
+kubectl kustomize k8s/overlays/prod
+```
+
+Aplicar o overlay prod:
+
+```bash
+kubectl apply -k k8s/overlays/prod
+```
+
+Validar o que sera aplicado (dry-run):
+
+```bash
+kubectl apply -k k8s/overlays/prod --dry-run=server
+```
+
+Ver diffs (se seu kubectl suportar):
+
+```bash
+kubectl diff -k k8s/overlays/prod
+```
+
+## Argo CD (prod)
+
+O Argo CD esta configurado em `k8s/argocd/application-prod.yaml` para:
+
+- `path: k8s/overlays/prod`
+- `targetRevision: main`
+- `destination.namespace: vendaweb-prod` (com `CreateNamespace=true`)
+
+Se voce esta usando Argo CD, o fluxo recomendado e:
+
+- atualizar manifests no Git (overlay prod)
+- deixar o Argo CD sincronizar automaticamente
+
+## Configuracao (ConfigMap/Secret)
+
+- `k8s/base/configmap.yaml` (`vendaweb-api-config`)
+  - `REDIS_HOST`, `REDIS_PORT`, `DB_HOST`, `DB_PORT`, `DB_SERVICE_NAME`
+- `k8s/base/secret.yaml` (`vendaweb-api-secrets`)
+  - `DB_USERNAME`, `DB_PASSWORD`
+
+Importante:
+
+- O `Secret` esta em `stringData` no repositorio (texto puro). Para ambiente real, prefira um gerenciador de segredos (ExternalSecrets, SOPS, Vault etc.) e nao commite credenciais.
+
+## Imagem e pipeline
+
+O workflow `.gitea/workflows/deploy-api.yaml`:
+
+- builda e publica `git.simplifiquehc.com.br/simplifique/vendaweb-api:<sha7>` e `:latest`
+- atualiza `k8s/overlays/prod/deployment-image-digest-patch.yaml` para apontar para o tag do commit
+
+Isso e pensado para o Argo CD detectar a alteracao no Git e aplicar.
+
+## Comandos uteis (day-2)
+
+Assumindo namespace `vendaweb-prod`:
+
+```bash
+kubectl -n vendaweb-prod get all
+kubectl -n vendaweb-prod get pods -l app=vendaweb-api -o wide
+kubectl -n vendaweb-prod describe deploy/vendaweb-api
+kubectl -n vendaweb-prod describe pod -l app=vendaweb-api
+```
+
+Logs:
+
+```bash
+kubectl -n vendaweb-prod logs deploy/vendaweb-api --tail=200
+kubectl -n vendaweb-prod logs -l app=vendaweb-api --tail=200 --all-containers
+kubectl -n vendaweb-prod logs -l app=vendaweb-api -f
+```
+
+Rollout:
+
+```bash
+kubectl -n vendaweb-prod rollout status deploy/vendaweb-api
+kubectl -n vendaweb-prod rollout history deploy/vendaweb-api
+kubectl -n vendaweb-prod rollout restart deploy/vendaweb-api
+```
+
+Exec/Debug:
+
+```bash
+kubectl -n vendaweb-prod exec -it deploy/vendaweb-api -- sh
+kubectl -n vendaweb-prod port-forward svc/vendaweb-api 8067:8067
+```
+
+## Troubleshooting rapido
+
+- `ImagePullBackOff`:
+  - conferir `imagePullSecrets: gitea-auth` no namespace (`kubectl -n vendaweb-prod get secret gitea-auth`)
+  - conferir o valor de `image:` no overlay prod
+
+- `CrashLoopBackOff`:
+  - ver logs do pod e eventos (`kubectl -n vendaweb-prod describe pod ...`)
+  - validar variaveis do `ConfigMap`/`Secret`
+
+- Probes falhando:
+  - garantir que a rota `/v1/health` responde 200 e que a app esta ouvindo em `8067`
+
+## Mudancas comuns
+
+- Alterar porta externa (NodePort): `k8s/overlays/prod/service-patch.yaml`
+- Alterar replicas em prod: `k8s/overlays/prod/deployment-prod-patch.yaml`
+- Alterar imagem/tag em prod: `k8s/overlays/prod/deployment-image-digest-patch.yaml`
+- Alterar envs: `k8s/base/configmap.yaml` e `k8s/base/secret.yaml`

k8s/argocd/application-prod.yaml

@@ -6,14 +6,22 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://git.simplifiquehc.com.br/simplifique/Vendaweb-api.git
+    repoURL: http://172.35.0.216:3000/simplifique/Vendaweb-api.git
     targetRevision: main
     path: k8s/overlays/prod
   destination:
     server: https://kubernetes.default.svc
-    namespace: vendaweb-api
+    namespace: vendaweb-prod
   syncPolicy:
     automated:
       selfHeal: true
+      prune: true
+    retry:
+      limit: 2
+      backoff:
+        duration: 5s
+        factor: 2
+        maxDuration: 3m
     syncOptions:
       - CreateNamespace=true
+      - PruneLast=true

k8s/base/deployment.yaml

@@ -5,7 +5,15 @@ metadata:
   labels:
     app: vendaweb-api
 spec:
-  replicas: 15
+  replicas: 3
+  revisionHistoryLimit: 5
+  minReadySeconds: 10
+  progressDeadlineSeconds: 600
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   selector:
     matchLabels:
       app: vendaweb-api
@@ -15,10 +23,11 @@ spec:
         app: vendaweb-api
     spec:
       imagePullSecrets:
-        - name: harbor-secret
+        - name: gitea-auth
+      terminationGracePeriodSeconds: 30
       containers:
         - name: api
-          image: 172.35.0.216/library/vendaweb-api:latest
+          image: 172.35.0.216:3000/simplifique/vendaweb-api:589fa29
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

k8s/overlays/prod/deployment-image-digest-patch.yaml

@@ -7,4 +7,4 @@ spec:
     spec:
       containers:
         - name: api
-          image: 172.35.0.216/library/vendaweb-api@sha256:aac490fcb4ef7baa95f1df01fa50d2d44bdb4ed12b235e5dd89e1d7dc3cd0a3a
+          image: 172.35.0.216:3000/simplifique/vendaweb-api:5279ae9

k8s/overlays/prod/deployment-prod-patch.yaml

@@ -0,0 +1,6 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: vendaweb-api
+spec:
+  replicas: 2

k8s/overlays/prod/hpa.yaml

@@ -0,0 +1,18 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: vendaweb-api
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vendaweb-api
+  minReplicas: 2
+  maxReplicas: 15
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: 70

k8s/overlays/prod/kustomization.yaml

@@ -5,7 +5,9 @@ namespace: vendaweb-prod
 
 resources:
   - ../../base
+  - hpa.yaml
 
 patches:
-  - path: deployment-image-digest-patch.yaml
   - path: service-patch.yaml
+  - path: deployment-prod-patch.yaml
+  - path: deployment-image-digest-patch.yaml

k8s/overlays/prod/service-patch.yaml

@@ -8,4 +8,4 @@ spec:
     - name: http
       port: 8067
       targetPort: 8067
-      nodePort: 30001
+      nodePort: 32619

package-lock.json

@@ -20,7 +20,7 @@
         "@types/cache-manager": "^3.4.3",
         "cache-manager": "^3.6.3",
         "cache-manager-redis-store": "^3.0.1",
-        "compression": "^1.7.4",
+        "compression": "^1.8.1",
         "crc": "^4.3.2",
         "fs": "0.0.1-security",
         "guid-typescript": "^1.0.9",
@@ -4181,16 +4181,17 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
+      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
+      "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.5",
+        "bytes": "3.1.2",
-        "bytes": "3.0.0",
+        "compressible": "~2.0.18",
-        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "on-headers": "~1.0.2",
+        "negotiator": "~0.6.4",
-        "safe-buffer": "5.1.2",
+        "on-headers": "~1.1.0",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -4198,17 +4199,22 @@
       }
     },
     "node_modules/compression/node_modules/bytes": {
-      "version": "3.0.0",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/compression/node_modules/safe-buffer": {
+    "node_modules/compression/node_modules/negotiator": {
-      "version": "5.1.2",
+      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -9810,9 +9816,10 @@
       }
     },
     "node_modules/on-headers": {
-      "version": "1.0.2",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }

package.json

@@ -32,7 +32,7 @@
     "@types/cache-manager": "^3.4.3",
     "cache-manager": "^3.6.3",
     "cache-manager-redis-store": "^3.0.1",
-    "compression": "^1.7.4",
+    "compression": "^1.8.1",
     "crc": "^4.3.2",
     "fs": "0.0.1-security",
     "guid-typescript": "^1.0.9",

src/app.controller.ts

@@ -14,7 +14,7 @@ export class AppController {
   @Get('health')
   @ApiOperation({ summary: 'Health check' })
   healthCheck() {
-    return { status: 'SIMPLIFIQUE HOME CENTER 2026' };
+    return { status: 'NOVA VERSAO 2026' };
   }
 
 }

src/backoffice/lists/lists.controller.ts

@@ -28,7 +28,7 @@ export class ListsController {
      * Consulta tabela de checkouts da filial informada
      */
     @Get('checkout/:store')
-    @ApiParam({name: 'Código da filial',})
+    @ApiParam({ name: 'Código da filial', })
     async getCheckout(@Param('store') idStore: string) {
         return this.listsServices.GetCheckout(idStore);
     }
@@ -44,9 +44,9 @@ export class ListsController {
     /**
     * Consulta tabela de plano de pagamento para pedido de venda
     */
-    @Get('paymentplan/:billindid')
+    @Get('paymentplan/:billindid/:customerId')
-        async getPaymentPlan(@Param('billindid') billingId: string) {
+    async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
-        return this.listsServices.GetPaymentPlan(billingId);
+        return this.listsServices.GetPaymentPlan(billingId, customerId);
     }
 
     /**

src/backoffice/lists/lists.service.ts

@@ -15,11 +15,11 @@ export class ListsService {
         await queryRunner.connect();
         try {
             const sql = `SELECT PCFILIAL.CODIGO as "id", ` +
-                        `       PCFILIAL.RAZAOSOCIAL as "name",  ` + 
+                `       PCFILIAL.RAZAOSOCIAL as "name",  ` +
-                        `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
+                `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
-                        `  FROM PCFILIAL  ` +
+                `  FROM PCFILIAL  ` +
-                        ` WHERE PCFILIAL.CODIGO <> '99'  ` +
+                ` WHERE PCFILIAL.CODIGO <> '99'  ` +
-                        ` ORDER BY PCFILIAL.CODIGO `;
+                ` ORDER BY PCFILIAL.CODIGO `;
             const stores = await queryRunner.query(sql);
             return stores as Store[];
         } catch (error) {
@@ -37,12 +37,12 @@ export class ListsService {
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         const sql = `SELECT PCFILIAL.CODIGO as "id", ` +
-        `       PCFILIAL.RAZAOSOCIAL as "name",  ` + 
+            `       PCFILIAL.RAZAOSOCIAL as "name",  ` +
-        `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
+            `       PCFILIAL.CODIGO|| ' - '|| PCFILIAL.FANTASIA as "shortName"   ` +
-        `  FROM PCFILIAL  `;
+            `  FROM PCFILIAL  `;
         const whereByUser = " WHERE PCFILIAL.CODIGO <> '99' AND " +
-                            " ((PCFILIAL.CODIGO IN ( SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser )) OR " +
+            " ((PCFILIAL.CODIGO IN ( SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser )) OR " +
-                            "        (EXISTS(SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser AND PCLIB.CODIGOA = '99')) ) ";
+            "        (EXISTS(SELECT PCLIB.CODIGOA FROM PCLIB WHERE PCLIB.CODTABELA = 1 AND PCLIB.CODFUNC = :iduser AND PCLIB.CODIGOA = '99')) ) ";
 
         const orderBy = ` ORDER BY PCFILIAL.CODIGO`
         try {
@@ -66,7 +66,7 @@ export class ListsService {
             const checkouts = await queryRunner.manager
                 .getRepository(Checkout)
                 .createQueryBuilder('pccaixa')
-                .where("\"pccaixa\".CODFILIAL = :idStore", {idStore: idStore})
+                .where("\"pccaixa\".CODFILIAL = :idStore", { idStore: idStore })
                 .orderBy("\"pccaixa\".NUMCAIXA")
                 .getMany();
             return checkouts;
@@ -89,7 +89,7 @@ export class ListsService {
                 .getRepository(Pcempr)
                 .createQueryBuilder('pcempr')
                 .select("\"pcempr\".matricula as \"id\", \"pcempr\".nome as \"name\", \"pcempr\".email as \"email\", \"pcempr\".usuariobd as \"smallName\"")
-                .where("\"pcempr\".CODFILIAL = :idStore", {idStore: idStore})
+                .where("\"pcempr\".CODFILIAL = :idStore", { idStore: idStore })
                 .orderBy("\"pcempr\".NOME")
                 .getRawMany();
             return checkouts;
@@ -102,20 +102,24 @@ export class ListsService {
         }
     }
 
-    async GetPaymentPlan(billingId: string){
+    async GetPaymentPlan(billingId: string, clientId: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = '  SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  ' +
+            const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  
-                        '         NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' +
+                                NVL(PCPLPAG.NUMDIAS,0) as "numdias" 
-                        '    FROM PCPLPAG  ' +     
+                           FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI   
-                        '    WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' +
+                          WHERE PCCLIENT.CODCLI = :CODCLI
-                        '                  WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' + 
+                            AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
-                        '                   AND PCCOBPLPAG.CODCOB = :CODCOB ) '
+                            AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999) 
-                        '  ORDER BY PCPAG.DESCRICAO ';
+                            AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG 
-            const paymentPlans = await queryRunner.query(sql, [billingId]);
+                                                    WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG 
+                                                                AND PCCOBPLPAG.CODCOB = :CODCOB ) 
+                          ORDER BY PCPLPAG.DESCRICAO`;
+
+            const paymentPlans = await queryRunner.query(sql, [clientId, billingId]);
             return paymentPlans;
         } catch (error) {
             throw error;
@@ -125,20 +129,20 @@ export class ListsService {
         }
     }
 
-    async GetBilling(clienteId: number){
+    async GetBilling(clienteId: number) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = ' SELECT PCCOB.CODCOB as "codcob", PCCOB.CODCOB ||\' - \'||PCCOB.COBRANCA as "cobranca" ' +
-                        '   FROM PCCOB ' +
+                '   FROM PCCOB ' +
-                        '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' + 
+                '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' +
-                        '               AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI  ) AND  ' +
+                '               AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI  ) AND  ' +
-                        '                   ( PCCOB.NIVELVENDA <= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
+                '                   ( PCCOB.NIVELVENDA >= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
-                        '                                            WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' +
+                '                                            WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' +
-                        '                      EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
+                '                      EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
-                        ' ORDER BY PCCOB.CODCOB';
+                ' ORDER BY PCCOB.CODCOB';
             const billings = await queryRunner.query(sql, [clienteId]);
             return billings;
         } catch (error) {
@@ -149,16 +153,16 @@ export class ListsService {
         }
     }
 
-    async GetPartners(){
+    async GetPartners() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  ESTPARCEIRO.ID as "id" ' +
-                        '         ,REGEXP_REPLACE(ESTPARCEIRO.CPF, \'[^0-9]\',\'\') || \' - \' ||ESTPARCEIRO.NOME as "name"  ' +
+                '         ,REGEXP_REPLACE(ESTPARCEIRO.CPF, \'[^0-9]\',\'\') || \' - \' ||ESTPARCEIRO.NOME as "name"  ' +
-                        '    FROM ESTPARCEIRO '  +
+                '    FROM ESTPARCEIRO ' +
-                        '   WHERE 1 = 1 ';
+                '   WHERE 1 = 1 ';
             const partners = await queryRunner.manager
                 .query(sql);
             return partners;
@@ -170,18 +174,18 @@ export class ListsService {
         }
     }
 
-    async GetPreCustomer(idCart: string){
+    async GetPreCustomer(idCart: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = '  select CPF as "document"     '+
+            const sql = '  select CPF as "document"     ' +
-                        '        ,NOME as "name"        ' +
+                '        ,NOME as "name"        ' +
-                        '        ,TELEFONE as "phone"   ' +
+                '        ,TELEFONE as "phone"   ' +
-                        '        ,IDCART as "idCart"    ' +
+                '        ,IDCART as "idCart"    ' +
-                        '    from estvendaprecliente    ' +
+                '    from estvendaprecliente    ' +
-                        '   where IDCART = :idcart      ';
+                '   where IDCART = :idcart      ';
             console.log(idCart);
             const preCustomer = await queryRunner
                 .query(sql, [idCart]);
@@ -195,16 +199,16 @@ export class ListsService {
         }
     }
 
-    async GetPlaces(){
+    async GetPlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCPRACA.CODPRACA as "id" ' +
-                        '         ,PCPRACA.PRACA as "name"  ' +
+                '         ,PCPRACA.PRACA as "name"  ' +
-                        '    FROM PCPRACA '  +
+                '    FROM PCPRACA ' +
-                        '   WHERE 1 = 1';
+                '   WHERE 1 = 1';
             const places = await queryRunner.manager
                 .query(sql);
             return places;
@@ -216,16 +220,16 @@ export class ListsService {
         }
     }
 
-    async GetStorePlaces(){
+    async GetStorePlaces() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCPRACA.CODPRACA as "id" ' +
-                        '         ,PCPRACA.PRACA as "name"  ' +
+                '         ,PCPRACA.PRACA as "name"  ' +
-                        '    FROM PCPRACA '  +
+                '    FROM PCPRACA ' +
-                        '   WHERE PCPRACA.CODPRACAPRINCIPAL = 1004';
+                '   WHERE PCPRACA.CODPRACAPRINCIPAL = 1004';
             const places = await queryRunner.manager
                 .query(sql);
             return places;
@@ -237,17 +241,17 @@ export class ListsService {
         }
     }
 
-    async GetRamo(){
+    async GetRamo() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCATIVI.CODATIV as "id" ' +
-                        '         ,PCATIVI.RAMO as "name"  ' +
+                '         ,PCATIVI.RAMO as "name"  ' +
-                        '    FROM PCATIVI '  +
+                '    FROM PCATIVI ' +
-                        '   WHERE 1 = 1 ' +
+                '   WHERE 1 = 1 ' +
-                        ' ORDER BY PCATIVI.RAMO';
+                ' ORDER BY PCATIVI.RAMO';
             const ramos = await queryRunner.manager
                 .query(sql);
             return ramos;
@@ -259,14 +263,14 @@ export class ListsService {
         }
     }
 
-    async GetStates(state: string){
+    async GetStates(state: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
             const sql = '  SELECT  PCESTADO.ESTADO as "name" FROM PCESTADO' +
-                        '   WHERE  PCESTADO.UF = :1';
+                '   WHERE  PCESTADO.UF = :1';
             const states = await queryRunner.manager
                 .query(sql, [state]);
             return states[0].name;
@@ -278,7 +282,7 @@ export class ListsService {
         }
     }
 
-    async getSupervisores(){
+    async getSupervisores() {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -299,4 +303,4 @@ export class ListsService {
         }
     }
 
- }
+}

src/delivery/services/shipping.service.ts

@@ -128,20 +128,20 @@ export class ShippingService {
         .getRepository(Esvretiralojascliente)
         .createQueryBuilder('ESVRETIRALOJASCLIENTE')
         .select([
-                'codfilial        as "codigoFilial"'
+          'codfilial        as "codigoFilial"'
-                ,'numped          as "numeroPedido"'
+          , 'numped          as "numeroPedido"'
-                ,'numnota         as "numeroNota"'
+          , 'numnota         as "numeroNota"'
-                ,'dtfat           as "dataFaturamento"'
+          , 'dtfat           as "dataFaturamento"'
-                ,'datapedido      as "dataPedido"'
+          , 'datapedido      as "dataPedido"'
-                ,'codcli          as "codigoCliente"'
+          , 'codcli          as "codigoCliente"'
-                ,'cliente         as "nomeCliente"'
+          , 'cliente         as "nomeCliente"'
-                ,'codfilialretira as "codigoLoja"'
+          , 'codfilialretira as "codigoLoja"'
-                ,'razaosocial     as "nomeLoja"'
+          , 'razaosocial     as "nomeLoja"'
-                ,'qtitens         as "quantidadeItens"'
+          , 'qtitens         as "quantidadeItens"'
-                ,'quantidade      as "quantidade"'
+          , 'quantidade      as "quantidade"'
         ])
         .where("email = 'eduardoestevao.gyn@gmail.com'")
-        .andWhere("codfilial = :codfilial", {codfilial: id})
+        .andWhere("codfilial = :codfilial", { codfilial: id })
         .getRawMany();
 
       return deliveries;
@@ -169,13 +169,13 @@ export class ShippingService {
       const sql = `SELECT PCDIASUTEIS.DATA               as "dateDelivery",
                           NVL (PCDIASUTEIS.DIAROTA, 'N') as "delivery",
                           CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 
-                             ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 12)) END as "deliverySize",
+                             ELSE (PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA', 1)) END as "deliverySize",
                           ROUND ( (NVL (VENDAS.TOTPESO, 0) / 1000), 3)               as "saleWeigth",
                           CASE WHEN NVL (PCDIASUTEIS.DIAROTA, 'N') = 'N' THEN 0 
                             ELSE ROUND (
                               GREATEST (
                                     (  (  PARAMFILIAL.OBTERCOMONUMBER ('CAPACIDADE_LOGISTICA',
-                                                                        12)
+                                                                        1)
                                         * 1000)
                                       - NVL (VENDAS.TOTPESO, 0))
                                   / 1000,
@@ -186,7 +186,9 @@ export class ShippingService {
                               FROM PCPEDC
                             WHERE     PCPEDC.POSICAO IN ('L', 'M')
                                   AND PCPEDC.CONDVENDA = 8
-                                  AND PCPEDC.CODFILIAL IN (12, 13, 4, 6)
+                                  AND EXISTS(SELECT 1 FROM PCPEDI 
+                                                WHERE PCPEDI.NUMPED = PCPEDC.NUMPED 
+                                                    AND PCPEDI.CODFILIALRETIRA IN (1) )
                                   AND EXISTS
                                           (SELECT TV7.NUMPED
                                               FROM PCPEDC TV7
@@ -194,19 +196,19 @@ export class ShippingService {
                                                   AND TV7.POSICAO = 'F')
                                   AND PCPEDC.DTENTREGA >= TRUNC (SYSDATE) + 3
                           GROUP BY PCPEDC.DTENTREGA) VENDAS
-                  WHERE PCDIASUTEIS.CODFILIAL = 12 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S'
+                  WHERE PCDIASUTEIS.CODFILIAL = 1 AND PCDIASUTEIS.DATA BETWEEN TRUNC (SYSDATE) + 3 AND TRUNC(SYSDATE) + 20 --AND NVL(PCDIASUTEIS.DIAROTA,'N') = 'S'
                         AND PCDIASUTEIS.DATA = VENDAS.DTENTREGA(+)
                 ORDER BY PCDIASUTEIS.DATA `;
 
-        const data = await queryRunner.query(sql);
+      const data = await queryRunner.query(sql);
 
-        const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE), 
+      const sqlDeliveryDate = `SELECT TRUNC(SYSDATE) + esf_calcular_prazo_entrega_programada(TRUNC(SYSDATE), 
-                                              '12', 
+                                              '1', 
-                                            129, '', 0, 500) as "date"
+                                            169, '', 0, 500) as "date"
                                   FROM DUAL`;
-        const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);
+      const dataDeliveryDate = await queryRunner.query(sqlDeliveryDate);
 
-        const dataComplete = { dateDelivery: dataDeliveryDate[0].date, deliveries: [...data] };
+      const dataComplete = { dateDelivery: dataDeliveryDate[0].date, deliveries: [...data] };
 
       return dataComplete;
 

src/domain/entity/tables/pccidade.entity.ts

@@ -26,9 +26,6 @@ export class Pccidade {
     @Column({ name: 'CODMUNSIAFI' })
     codmunsiafi: number;
 
-    @Column({ name: 'DTMXSALTER' })
-    dtmxsalter: Date;
-    
     @Column({ name: 'LATITUDE' })
     latitude: string;
 

src/domain/entity/tables/pcorcavendai.entity.ts

@@ -2,94 +2,91 @@ import { Column, Entity, PrimaryColumn } from "typeorm";
 
 @Entity("PCORCAVENDAI")
 export class Pcorcavendai {
-    @PrimaryColumn({name: 'NUMORCA'})
+    @PrimaryColumn({ name: 'NUMORCA' })
     numorca: number;
 
-    @PrimaryColumn({name: 'CODPROD'})
+    @PrimaryColumn({ name: 'CODPROD' })
     codprod: number;
 
-    @PrimaryColumn({name: 'NUMSEQ'})
+    @PrimaryColumn({ name: 'NUMSEQ' })
     numseq: number;
 
-    @Column({name: 'DATA'})
+    @Column({ name: 'DATA' })
     data: Date;
 
-    @Column({name: 'CODCLI'})
+    @Column({ name: 'CODCLI' })
     codcli: number;
 
-    @Column({name: 'CODUSUR'})
+    @Column({ name: 'CODUSUR' })
     codusur: number;
 
-    @Column({name: 'QT'})
+    @Column({ name: 'QT' })
     qt: number;
 
-    @Column({name: 'PVENDA'})
+    @Column({ name: 'PVENDA' })
     pvenda: number;
 
-    @Column({name: 'PTABELA'})
+    @Column({ name: 'PTABELA' })
     ptabela: number;
 
-    @Column({name: 'NUMCAR'})
+    @Column({ name: 'NUMCAR' })
     numcar: number;
 
-    @Column({name: 'POSICAO'})
+    @Column({ name: 'POSICAO' })
     posicao: string;
 
-    @Column({name: 'ST'})
+    @Column({ name: 'ST' })
     st: number;
 
-    @Column({name: 'VLCUSTOFIN'})
+    @Column({ name: 'VLCUSTOFIN' })
     vlcustofin: number;
 
-    @Column({name: 'VLCUSTOREAL'})
+    @Column({ name: 'VLCUSTOREAL' })
     vlcustoreal: number;
 
-    @Column({name: 'PERCOM'})
+    @Column({ name: 'PERCOM' })
     percom: number;
 
-    @Column({name: 'PERDESC'})
+    @Column({ name: 'PERDESC' })
     perdesc: number;
 
-    @Column({name: 'PVENDABASE'})
+    @Column({ name: 'PVENDABASE' })
     pvendabase: number;
 
-    @Column({name: 'CODST'})
+    @Column({ name: 'CODST' })
     codst: number;
 
-    @Column({name: 'CUSTOFINEST'})
+    @Column({ name: 'CUSTOFINEST' })
     custofinest: number;
 
-    @Column({name: 'CODAUXILIAR'})
+    @Column({ name: 'CODAUXILIAR' })
     codauxiliar: number;
 
-    @Column({name: 'CODFILIALRETIRA'})
+    @Column({ name: 'CODFILIALRETIRA' })
     codfilialretira: string;
 
-    @Column({name: 'PORIGINAL'})
+    @Column({ name: 'PORIGINAL' })
     poriginal: number;
 
-    @Column({name: 'VLCUSTOCONT'})
+    @Column({ name: 'VLCUSTOCONT' })
     vlcustocont: number;
 
-    @Column({name: 'VLCUSTOREP'})
+    @Column({ name: 'VLCUSTOREP' })
     vlcustorep: number;
 
-    @Column({name: 'PBASERCA'})
+    @Column({ name: 'PBASERCA' })
     pbaserca: number;
 
-    @Column({name: 'PVENDA1'})
+    @Column({ name: 'PVENDA1' })
     pvenda1: number;
 
-    @Column({name: 'TIPOENTREGA'})
+    @Column({ name: 'TIPOENTREGA' })
     tipoentrega: string;
 
-    @Column({name: 'COMPLEMENTO'})
+    @Column({ name: 'COMPLEMENTO' })
     complemento: string;
 
-    @Column({name: 'AMBIENTE'})
+    @Column({ name: 'AMBIENTE' })
     ambiente: string;
 
-    @Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-    rp_imediata: string;
-    
 }

src/domain/entity/tables/pcpeditemp.entity.ts

@@ -3,167 +3,165 @@ import { Column, Entity, PrimaryColumn } from "typeorm";
 @Entity('PCPEDITEMP')
 export class Pcpeditemp {
 
-@Column({ name: 'TIPOINTEGRACAO' })
+    @Column({ name: 'TIPOINTEGRACAO' })
-tipointegracao: string;
+    tipointegracao: string;
 
-@Column({ name: 'OBSERVACAO_PC' })
+    @Column({ name: 'OBSERVACAO_PC' })
-observacao_pc: string;
+    observacao_pc: string;
 
-@Column({ name: 'NUMPEDCLI' })
+    @Column({ name: 'NUMPEDCLI' })
-numpedcli: string;
+    numpedcli: string;
 
-@PrimaryColumn({ name: 'NUMPEDRCA' })
+    @PrimaryColumn({ name: 'NUMPEDRCA' })
-numpedrca: number;
+    numpedrca: number;
 
-@Column({ name: 'CODCLI' })
+    @Column({ name: 'CODCLI' })
-codcli: number;
+    codcli: number;
 
-@Column({ name: 'CODUSUR' })
+    @Column({ name: 'CODUSUR' })
-codusur: number;
+    codusur: number;
 
-@Column({ name: 'DATA' })
+    @Column({ name: 'DATA' })
-data: Date;
+    data: Date;
 
-@PrimaryColumn({ name: 'CODPROD' })
+    @PrimaryColumn({ name: 'CODPROD' })
-codprod: number;
+    codprod: number;
 
-@Column({ name: 'QT' })
+    @Column({ name: 'QT' })
-qt: number;
+    qt: number;
 
-@Column({ name: 'QT_FATURADA' })
+    @Column({ name: 'QT_FATURADA' })
-qt_faturada: number;
+    qt_faturada: number;
 
-@Column({ name: 'PVENDA' })
+    @Column({ name: 'PVENDA' })
-pvenda: number;
+    pvenda: number;
 
-@Column({ name: 'PTABELA' })
+    @Column({ name: 'PTABELA' })
-ptabela: number;
+    ptabela: number;
 
-@Column({ name: 'PERDESC' })
+    @Column({ name: 'PERDESC' })
-perdesc: number;
+    perdesc: number;
 
-@PrimaryColumn({ name: 'NUMSEQ' })
+    @PrimaryColumn({ name: 'NUMSEQ' })
-numseq: number;
+    numseq: number;
 
-@Column({ name: 'CODAUXILIAR' })
+    @Column({ name: 'CODAUXILIAR' })
-codauxiliar: number;
+    codauxiliar: number;
 
-@Column({ name: 'CODCERTIFIC' })
+    @Column({ name: 'CODCERTIFIC' })
-codcertific: number;
+    codcertific: number;
 
-@Column({ name: 'CODFILIALRETIRA' })
+    @Column({ name: 'CODFILIALRETIRA' })
-codfilialretira: string;
+    codfilialretira: string;
 
-@Column({ name: 'NUMLOTE' })
+    @Column({ name: 'NUMLOTE' })
-numlote: string;
+    numlote: string;
 
-@Column({ name: 'COMPLEMENTO' })
+    @Column({ name: 'COMPLEMENTO' })
-complemento: string;
+    complemento: string;
 
-@Column({ name: 'CODPLPAG' })
+    @Column({ name: 'CODPLPAG' })
-codplpag: number;
+    codplpag: number;
 
-@Column({ name: 'CODPROMOCAO' })
+    @Column({ name: 'CODPROMOCAO' })
-codpromocao: string;
+    codpromocao: string;
 
-@Column({ name: 'PRAZOMEDIO' })
+    @Column({ name: 'PRAZOMEDIO' })
-prazomedio: number;
+    prazomedio: number;
 
-@Column({ name: 'LOCALIZACAO' })
+    @Column({ name: 'LOCALIZACAO' })
-localizacao: string;
+    localizacao: string;
 
-@Column({ name: 'PBONIFIC' })
+    @Column({ name: 'PBONIFIC' })
-pbonific: number;
+    pbonific: number;
 
-@Column({ name: 'CODDEGUSTACAO' })
+    @Column({ name: 'CODDEGUSTACAO' })
-coddegustacao: number;
+    coddegustacao: number;
 
-@Column({ name: 'PESOBRUTO' })
+    @Column({ name: 'PESOBRUTO' })
-pesobruto: number;
+    pesobruto: number;
 
-@Column({ name: 'EANCODPROD' })
+    @Column({ name: 'EANCODPROD' })
-eancodprod: number;
+    eancodprod: number;
 
-@Column({ name: 'CODNAOATENDIMENTO' })
+    @Column({ name: 'CODNAOATENDIMENTO' })
-codnaoatendimento: number;
+    codnaoatendimento: number;
 
-@Column({ name: 'OBSINTEGRACAO1' })
+    @Column({ name: 'OBSINTEGRACAO1' })
-obsintegracao1: string;
+    obsintegracao1: string;
 
-@Column({ name: 'OBSINTEGRACAO2' })
+    @Column({ name: 'OBSINTEGRACAO2' })
-obsintegracao2: string;
+    obsintegracao2: string;
 
-@Column({ name: 'NUMPEDWEB' })
+    @Column({ name: 'NUMPEDWEB' })
-numpedweb: number;
+    numpedweb: number;
 
-@Column({ name: 'TRANSACAO' })
+    @Column({ name: 'TRANSACAO' })
-transacao: number;
+    transacao: number;
 
-@Column({ name: 'IDVENDA' })
+    @Column({ name: 'IDVENDA' })
-idvenda: number;
+    idvenda: number;
 
-@Column({ name: 'INTEGRADORA' })
+    @Column({ name: 'INTEGRADORA' })
-integradora: number;
+    integradora: number;
 
-@Column({ name: 'CODRETORNO' })
+    @Column({ name: 'CODRETORNO' })
-codretorno: number;
+    codretorno: number;
 
-@Column({ name: 'COMISSAOATIM' })
+    @Column({ name: 'COMISSAOATIM' })
-comissaoatim: number;
+    comissaoatim: number;
 
-@Column({ name: 'TIPOENTREGA' })
+    @Column({ name: 'TIPOENTREGA' })
-tipoentrega: string;
+    tipoentrega: string;
 
-@Column({ name: 'CODRETORNOS' })
+    @Column({ name: 'CODRETORNOS' })
-codretornos: string;
+    codretornos: string;
 
-@Column({ name: 'DTINCLUSAO' })
+    @Column({ name: 'DTINCLUSAO' })
-dtinclusao: Date;
+    dtinclusao: Date;
 
-@Column({ name: 'CODPRODCESTA' })
+    @Column({ name: 'CODPRODCESTA' })
-codprodcesta: number;
+    codprodcesta: number;
 
-@Column({ name: 'BONIFIC' })
+    @Column({ name: 'BONIFIC' })
-bonific: string;
+    bonific: string;
 
-@Column({ name: 'DTIMP' })
+    @Column({ name: 'DTIMP' })
-dtimp: Date;
+    dtimp: Date;
 
-@Column({ name: 'PBASERCA' })
+    @Column({ name: 'PBASERCA' })
-pbaserca: number;
+    pbaserca: number;
 
-@Column({ name: 'VLFRETE' })
+    @Column({ name: 'VLFRETE' })
-vlfrete: number;
+    vlfrete: number;
 
-@Column({ name: 'FATORCONVERSAO' })
+    @Column({ name: 'FATORCONVERSAO' })
-fatorconversao: number;
+    fatorconversao: number;
 
-@Column({ name: 'IDKITPRODUTO' })
+    @Column({ name: 'IDKITPRODUTO' })
-idkitproduto: string;
+    idkitproduto: string;
 
-@Column({ name: 'MOVIMENTACONTACORRENTERCA' })
+    @Column({ name: 'MOVIMENTACONTACORRENTERCA' })
-movimentacontacorrenterca: string;
+    movimentacontacorrenterca: string;
 
-@Column({ name: 'PORIGINAL' })
+    @Column({ name: 'PORIGINAL' })
-poriginal: number;
+    poriginal: number;
 
-@Column({ name: 'ESC_EMBALAGEMPRESENTE' })
+    @Column({ name: 'ESC_EMBALAGEMPRESENTE' })
-esc_embalagempresente: string;
+    esc_embalagempresente: string;
 
-@Column({ name: 'QTUNITEMB' })
+    @Column({ name: 'QTUNITEMB' })
-qtunitemb: number;
+    qtunitemb: number;
 
-@Column({ name: 'IDREMESSAWEB' })
+    @Column({ name: 'IDREMESSAWEB' })
-idremessaweb: number;
+    idremessaweb: number;
 
-@Column({ name: 'CODFILIAL' })
+    @Column({ name: 'CODFILIAL' })
-codfilial: string;
+    codfilial: string;
 
-@Column({ name: 'CODCLIPARTILHA' })
+    @Column({ name: 'CODCLIPARTILHA' })
-codclipartilha: number;
+    codclipartilha: number;
 
-@Column({name: 'RETIRAPOSTERIOR_IMEDIATA'})
-rp_imediata: string;
 
 }
 

src/main.ts

@@ -6,20 +6,25 @@ import 'reflect-metadata';
 import { CustomLoggerService } from './services/custom-logger.service';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule, { cors: true, logger: new CustomLoggerService()});
+  const app = await NestFactory.create(AppModule, {
+    cors: true,
+    logger: new CustomLoggerService(),
+  });
   app.enableCors();
   app.use(compression());
   const options = new DocumentBuilder()
     .setTitle('API Venda web')
-    .setDescription(`API criada para realizar todo processo da venda assistida, como criação de oraçamento de venda, pedido de venda
+    .setDescription(
+      `API criada para realizar todo processo da venda assistida, como criação de oraçamento de venda, pedido de venda
                      cadastro de novos clientes, novos endereços. A API também fornece dados para o portal de parceiros como a manutenção
-                     do cadastro de parceiros, consulta de venda de movimentação e pagamentos, e fechamento das comissões dos parceiros.`)
+                     do cadastro de parceiros, consulta de venda de movimentação e pagamentos, e fechamento das comissões dos parceiros.`,
-    .setVersion("2023.1.2")
+    )
-    .addTag("VendaWeb")
+    .setVersion('2023.1.2')
-    .addTag("Autenticação")
+    .addTag('VendaWeb')
+    .addTag('Auth')
     .build();
   const document = SwaggerModule.createDocument(app, options);
-  SwaggerModule.setup("docs", app, document);
+  SwaggerModule.setup('docs', app, document);
   await app.listen(8067);
 }
 bootstrap();

src/sales/customer/customer.service.ts

@@ -469,9 +469,9 @@ export class CustomerService {
     async InitializeCustomer() {
         const cliente = new Pcclient();
         cliente.codusur1 = 1;
-        cliente.codplpag = 10;
+        cliente.codplpag = 18;
-        cliente.codpraca = 119;
+        cliente.codpraca = 169;
-        cliente.codcob = "D";
+        cliente.codcob = "CAR";
         cliente.dtcadastro = new Date();
         cliente.codcontab = "1";
         cliente.aceitavendafracao = "N";
@@ -502,7 +502,7 @@ export class CustomerService {
         cliente.tv10usacustoproduto = "N";
         cliente.inscestadual = "ISENTO";
         cliente.codpais = 1058; //Brasil 
-        cliente.observacao = "Importado do E-Commerce";
+        cliente.observacao = "Cadastrado Venda Web";
         cliente.aceitachterceiros = "S";
         cliente.agregarvalorstdescfin = "N";
         cliente.anvisa = "N";
@@ -523,6 +523,7 @@ export class CustomerService {
         cliente.fretedespacho = "0";
         cliente.aceitavendafracao = "S";
         cliente.validarmultiplovenda = "S";
+        cliente.isentotxentrega = "S";
 
         return cliente;
     }

src/sales/order/order.service.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/camelcase */
-import { HttpException, HttpStatus, Injectable,Inject } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable, Inject } from '@nestjs/common';
 import { ShoppingItens } from 'src/domain/entity/tables/estprevendai.entity';
 import { Sale } from 'src/domain/entity/tables/estvenda.entity';
 import { Pcpedctemp } from 'src/domain/entity/tables/pcpedctemp.entity';
@@ -165,8 +165,8 @@ export class OrderService {
                     `                  OR EXISTS(SELECT PCCOB.CODCOB FROM PCCOB ` +
                     `                                               WHERE PCCOB.CODCOB = PCPEDC.CODCOB ` +
                     `                                                 AND NVL(PCCOB.CARTAO,'N') = 'S') ) `;
-                await queryRunner.manager
+                //  await queryRunner.manager
-                    .query(sql, [order.numped]);
+                //      .query(sql, [order.numped]);
                 sql = `UPDATE PCPEDI SET POSICAO = 'L' WHERE NUMPED = :1 ` +
                     ` AND EXISTS( SELECT PCPEDC.NUMPED FROM PCPEDC ` +
                     `              WHERE PCPEDC.NUMPED = PCPEDI.NUMPED ` +
@@ -175,10 +175,10 @@ export class OrderService {
                     `                       OR EXISTS(SELECT PCCOB.CODCOB FROM PCCOB ` +
                     `                                  WHERE PCCOB.CODCOB = PCPEDC.CODCOB   ` +
                     `                                    AND NVL(PCCOB.CARTAO,'N') = 'S') ) )`;
-                await queryRunner.manager
+                //   await queryRunner.manager
-                    .query(sql, [order.numped]);
+                //       .query(sql, [order.numped]);
 
-                await this.updateStatusItem(queryRunner, order.numped);
+                //  await this.updateStatusItem(queryRunner, order.numped);
 
 
                 sql = ` UPDATE PCPEDC SET ` +
@@ -204,7 +204,7 @@ export class OrderService {
                     `    AND EXISTS(SELECT TV7.NUMPED FROM PCPEDC TV7 WHERE TV7.NUMPED = PCPEDC.NUMPEDENTFUT ` +
                     `                  AND TV7.POSICAO = 'L' )`;
 
-                await queryRunner.manager.query(sql, [order.numped]);
+                // await queryRunner.manager.query(sql, [order.numped]);
                 sql = ` UPDATE PCPEDC SET ` +
                     `                   POSICAO =  ( SELECT PCPEDI.POSICAO FROM PCPEDI WHERE PCPEDI.NUMPED = PCPEDC.NUMPED AND ROWNUM = 1 ) ` +
                     `                 , MOTIVOPOSICAO = NULL ` +
@@ -227,7 +227,7 @@ export class OrderService {
                     `    AND PCPEDC.NUMPEDENTFUT = :1 ` +
                     `    AND EXISTS(SELECT TV7.NUMPED FROM PCPEDC TV7 WHERE TV7.NUMPED = PCPEDC.NUMPEDENTFUT ` +
                     `                  AND TV7.POSICAO = 'L' )`;
-                await queryRunner.manager.query(sql, [order.numped]);
+                //   await queryRunner.manager.query(sql, [order.numped]);
 
                 // atualizar campos padrão para rotina 4116
                 sql = ` UPDATE PCPEDC SET ` +
@@ -527,6 +527,7 @@ export class OrderService {
             preOrder.esc_ajustarfinanceiro = "N";
             preOrder.esc_obternsu = "N";
             preOrder.esc_vloutrasdespweb = 0;
+            preOrder.vloutrasdesp = cart.shippingValue;
             preOrder.pedidopagoecommerce = "S";
             preOrder.numpedmktplace = "";
             preOrder.numitens = cart.itens.length;
@@ -538,7 +539,7 @@ export class OrderService {
 
             //Dados do cliente
             preOrder.codcli = cart.idCustomer;
-            preOrder.codpraca = (cart.shippingPriority == "M" && cart.idStorePlace != null ) ? cart.idStorePlace : customer.codpraca;
+            preOrder.codpraca = (cart.shippingPriority == "M" && cart.idStorePlace != null) ? cart.idStorePlace : customer.codpraca;
             preOrder.fretedespacho = customer.fretedespacho;
             preOrder.codfornecfrete = cart.carrierId;
 
@@ -585,8 +586,8 @@ export class OrderService {
                         itemOrder.codauxiliar = componente.ean;
                         itemOrder.codfilialretira = item.idStock;
                         itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-                        itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
+                        //  itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
-                        if ( item.deliveryMethod == 'RA') {
+                        if (item.deliveryMethod == 'RA') {
                             preOrder.dtentrega = new Date();
                         }
                         itemOrder.ptabela = Number.parseFloat(listPrice);
@@ -618,8 +619,8 @@ export class OrderService {
                     itemOrder.codauxiliar = item.ean;
                     itemOrder.codfilialretira = item.idStock;
                     itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-                    itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
+                    //itemOrder.rp_imediata = (item.deliveryMethod == 'RA') ? "S" : "N";
-                    if ( item.deliveryMethod == 'RA') {
+                    if (item.deliveryMethod == 'RA') {
                         preOrder.dtentrega = new Date();
                     }
                     itemOrder.ptabela = item.listPrice;
@@ -643,34 +644,34 @@ export class OrderService {
 
             //#endregion
 
-            if (cart.shippingValue > 0) {
+            // if (cart.shippingValue > 0) {
-                const itemOrder = new Pcpeditemp();
+            //     const itemOrder = new Pcpeditemp();
-                itemOrder.tipointegracao = "W";
+            //     itemOrder.tipointegracao = "W";
-                itemOrder.integradora = 10;
+            //     itemOrder.integradora = 10;
-                itemOrder.numpedrca = idPreOrder;
+            //     itemOrder.numpedrca = idPreOrder;
-                itemOrder.numpedweb = idPreOrder;
+            //     itemOrder.numpedweb = idPreOrder;
-                itemOrder.codcli = cart.idCustomer;
+            //     itemOrder.codcli = cart.idCustomer;
-                itemOrder.codusur = idSellerPreorder; //cart.idSeller;
+            //     itemOrder.codusur = idSellerPreorder; //cart.idSeller;
-                itemOrder.numseq = numeroSeq;
+            //     itemOrder.numseq = numeroSeq;
-                itemOrder.codprod = 48500;
+            //     itemOrder.codprod = 48500;
-                itemOrder.codauxiliar = 48500;
+            //     itemOrder.codauxiliar = 48500;
-                itemOrder.codfilialretira = '12';
+            //     itemOrder.codfilialretira = '12';
-                itemOrder.tipoentrega = 'EF';
+            //     itemOrder.tipoentrega = 'EF';
-                itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
+            //     itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
-                itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
+            //     itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
-                itemOrder.qt = 1;
+            //     itemOrder.qt = 1;
-                itemOrder.data = new Date();
+            //     itemOrder.data = new Date();
 
 
-                await queryRunner.manager
+            //     await queryRunner.manager
-                    .createQueryBuilder()
+            //         .createQueryBuilder()
-                    .insert()
+            //         .insert()
-                    .into(Pcpeditemp)
+            //         .into(Pcpeditemp)
-                    .values(itemOrder)
+            //         .values(itemOrder)
-                    .execute();
+            //         .execute();
 
-                numeroSeq = numeroSeq + 1;
+            //     numeroSeq = numeroSeq + 1;
-            }
+            // }
 
             // execute some operations on this transaction:
             await queryRunner.manager
@@ -825,12 +826,12 @@ export class OrderService {
                 ` WHERE PCPEDC.CODCLI = PCCLIENT.CODCLI ` +
                 `   AND PCPEDC.CONDVENDA IN (1,7) ` +
                 `   AND PCPEDC.DTCANCEL IS NULL AND PCPEDC.POSICAO NOT IN ('C') `;
-            `   AND PCPEDC.ROTINALANC = 'VENDAWEB' `;
+            `   AND EXISTS(SELECT 1 FROM ESTPREVENDAC WHERE ESTPREVENDAC.NUMPED = PCPEDC.NUMPED ) `; //PCPEDC.ROTINALANC = 'VENDAWEB' `;
             if (store != null && store != '') {
                 sqlWhere += ` AND PCPEDC.CODFILIAL = '${store}'  `;
             }
             if (document != null && document != '') {
-                sqlWhere += `   AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
+                sqlWhere += `   AND ((REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '') ) OR ( PCCLIENT.CODCLI = REGEXP_REPLACE('${document}', '[^0-9]', '')) )`;
             }
             if (name != null && name != '') {
                 sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
@@ -953,7 +954,7 @@ export class OrderService {
             const partners = await this.listsService.GetPartners();
             const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId);
             const billing = billinds.find(data => data.codcob === order[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob);
+            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob, order[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId);
             const partner = partners.find(data => data.id === order[0].partnerId);
 
@@ -1064,7 +1065,7 @@ export class OrderService {
     async getProductsOrder(store: string, initialDate: Date, finalDate: Date,
         document: string, name: string, sellerId: number, idOrder: string,
         typeFilterProduct: string, productText: string
-        ) {
+    ) {
 
         const sql = `SELECT  PCPEDC.DATA          as "date"
                             ,PCPEDC.NUMPED        as "orderId"
@@ -1103,52 +1104,52 @@ export class OrderService {
 
         let sqlWhere = '';
         if (store != null && store != '' && store != '99') {
-                sqlWhere += ` AND PCPEDC.CODFILIAL = '${store}'  `;
+            sqlWhere += ` AND PCPEDC.CODFILIAL = '${store}'  `;
-            }
+        }
-            if (document != null && document != '') {
+        if (document != null && document != '') {
-                sqlWhere += `   AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
+            sqlWhere += `   AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
-            }
+        }
-            if (name != null && name != '') {
+        if (name != null && name != '') {
-                sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
+            sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
-            }
+        }
-            if (sellerId > 0) {
+        if (sellerId > 0) {
-                sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId}  `;
+            sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId}  `;
-            }
+        }
-            if (idOrder.trim() != null && idOrder.trim() != '') {
+        if (idOrder.trim() != null && idOrder.trim() != '') {
-                sqlWhere += ` AND PCPEDC.NUMPED = ${idOrder}  `;
+            sqlWhere += ` AND PCPEDC.NUMPED = ${idOrder}  `;
-            }
+        }
 
-            if ( typeFilterProduct != '') {
+        if (typeFilterProduct != '') {
-                switch (typeFilterProduct) {
+            switch (typeFilterProduct) {
-                    case 'ID': 
+                case 'ID':
-                        sqlWhere += ` AND PCPEDI.CODPROD = ${productText} `;
+                    sqlWhere += ` AND PCPEDI.CODPROD = ${productText} `;
-                        break;
+                    break;
-                    case 'EAN': 
+                case 'EAN':
-                        sqlWhere += ` AND PCPRODUT.CODAUXILIAR = ${productText} `;
+                    sqlWhere += ` AND PCPRODUT.CODAUXILIAR = ${productText} `;
-                        break;
+                    break;
-                    case 'TEXT':
+                case 'TEXT':
-                        sqlWhere += ` AND PCPRODUT.DESCRICAO LIKE '${productText}%' `;
+                    sqlWhere += ` AND PCPRODUT.DESCRICAO LIKE '${productText}%' `;
-                        break;
+                    break;
-                    case 'PARTNER': 
+                case 'PARTNER':
-                        sqlWhere += ` AND PCPRODUT.CODFAB like '${productText}%'`;
+                    sqlWhere += ` AND PCPRODUT.CODFAB like '${productText}%'`;
-                        break;
+                    break;
-                    default: break;
+                default: break;
-                }
             }
+        }
 
-            //tratamento de data//
+        //tratamento de data//
-            const startDate = new Date(initialDate);
+        const startDate = new Date(initialDate);
-            let day = startDate.getDate();
+        let day = startDate.getDate();
-            let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
+        let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
-            let year = startDate.getFullYear();
+        let year = startDate.getFullYear();
-            const startFormat = day + "/" + month + "/" + year;
+        const startFormat = day + "/" + month + "/" + year;
-            const endDate = new Date(finalDate);
+        const endDate = new Date(finalDate);
-            day = endDate.getDate();
+        day = endDate.getDate();
-            month = ("00" + (endDate.getMonth() + 1)).slice(-2);
+        month = ("00" + (endDate.getMonth() + 1)).slice(-2);
-            year = endDate.getFullYear();
+        year = endDate.getFullYear();
-            const endFormat = day + "/" + month + "/" + year;
+        const endFormat = day + "/" + month + "/" + year;
 
-            sqlWhere += ` AND PCPEDI.DATA BETWEEN TO_DATE('${startFormat}', 'DD/MM/YYYY') AND TO_DATE('${endFormat}', 'DD/MM/YYYY')  `;
+        sqlWhere += ` AND PCPEDI.DATA BETWEEN TO_DATE('${startFormat}', 'DD/MM/YYYY') AND TO_DATE('${endFormat}', 'DD/MM/YYYY')  `;
 
 
         const connection = new Connection(connectionOptions);

src/sales/pre-order/pre-order.service.ts

@@ -51,7 +51,7 @@ export class PreOrderService {
             if (shopping.length > 0) {
                 idPreOrder = shopping[0].idPreOrder;
                 const existPreOrder = await queryRunner
-                        .query('SELECT PCORCAVENDAC.CODUSUR as "idRca" FROM PCORCAVENDAC WHERE NUMORCA = :NUMORCA', [idPreOrder]);
+                    .query('SELECT PCORCAVENDAC.CODUSUR as "idRca" FROM PCORCAVENDAC WHERE NUMORCA = :NUMORCA', [idPreOrder]);
                 idRca = existPreOrder[0].idRca;
                 await queryRunner.query('DELETE FROM PCORCAVENDAI WHERE NUMORCA = :1', [idPreOrder]);
                 await queryRunner.query('DELETE FROM PCORCAVENDAC WHERE NUMORCA = :1', [idPreOrder]);
@@ -70,9 +70,9 @@ export class PreOrderService {
                     cart.id, cart.preCustomerName, cart.preCustomerPhone, cart.idSeller, idPreOrder]);
                 }
             } else {
-                if ( cart.preCustomerDocument != null ) {
+                if (cart.preCustomerDocument != null) {
                     await queryRunner.query(`DELETE FROM ESTVENDAPRECLIENTE WHERE IDCART = :1 AND REGEXP_REPLACE(:CPF, '[^0-9]', '')`,
-                    [cart.id, cart.preCustomerDocument]); 
+                        [cart.id, cart.preCustomerDocument]);
                 }
             }
 
@@ -92,7 +92,7 @@ export class PreOrderService {
                 itemPreOrder.codcli = cart.idCustomer;
                 itemPreOrder.codprod = item.idProduct;
                 itemPreOrder.codauxiliar = item.ean;
-                itemPreOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+                itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
                 itemPreOrder.qt = item.quantity;
                 itemPreOrder.pvenda = item.salePrice;
                 itemPreOrder.ptabela = item.listPrice;
@@ -120,7 +120,7 @@ export class PreOrderService {
                 itemPreOrder.pvenda1 = 0;
                 itemPreOrder.tipoentrega = item.deliveryMethod;
                 // eslint-disable-next-line @typescript-eslint/camelcase
-                itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N";
+                // itemPreOrder.rp_imediata = (item.deliveryMethod == "RA") ? "S" : "N";
                 itemPreOrder.complemento = item.descriptionAux;
                 itemPreOrder.ambiente = item.environment;
 
@@ -137,52 +137,52 @@ export class PreOrderService {
                 numeroSeq = numeroSeq + 1;
             }
 
-            if (cart.shippingValue > 0) {
+            // if (cart.shippingValue > 0) {
-                const itemPreOrder = new Pcorcavendai();
+            //     const itemPreOrder = new Pcorcavendai();
-                itemPreOrder.numorca = preOrder.numorca;
+            //     itemPreOrder.numorca = preOrder.numorca;
-                itemPreOrder.data = this.formatDate(new Date());
+            //     itemPreOrder.data = this.formatDate(new Date());
-                itemPreOrder.codcli = cart.idCustomer;
+            //     itemPreOrder.codcli = cart.idCustomer;
-                itemPreOrder.codprod = 48500;
+            //     itemPreOrder.codprod = 48500;
-                itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+            //     itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
-                itemPreOrder.qt = 1;
+            //     itemPreOrder.qt = 1;
-                itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
+            //     itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
-                itemPreOrder.numcar = 0;
+            //     itemPreOrder.numcar = 0;
-                itemPreOrder.posicao = 'L';
+            //     itemPreOrder.posicao = 'L';
-                itemPreOrder.st = 0;
+            //     itemPreOrder.st = 0;
-                itemPreOrder.vlcustocont = 0;
+            //     itemPreOrder.vlcustocont = 0;
-                itemPreOrder.vlcustofin = 0;
+            //     itemPreOrder.vlcustofin = 0;
-                itemPreOrder.vlcustoreal = 0;
+            //     itemPreOrder.vlcustoreal = 0;
-                itemPreOrder.vlcustorep = 0;
+            //     itemPreOrder.vlcustorep = 0;
-                itemPreOrder.percom = 0;
+            //     itemPreOrder.percom = 0;
-                itemPreOrder.perdesc = 0;
+            //     itemPreOrder.perdesc = 0;
-                itemPreOrder.numseq = numeroSeq;
+            //     itemPreOrder.numseq = numeroSeq;
-                itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.pvendabase = 0;
-                itemPreOrder.codst = await this.
+            //     itemPreOrder.codst = await this.
-                    sharedService.
+            //         sharedService.
-                    getTaxId(48500,
+            //         getTaxId(48500,
-                        cart.saleStore,
+            //             cart.saleStore,
-                        customer.estent);
+            //             customer.estent);
-                itemPreOrder.custofinest = 0;
+            //     itemPreOrder.custofinest = 0;
-                itemPreOrder.codauxiliar = 48500;
+            //     itemPreOrder.codauxiliar = 48500;
-                itemPreOrder.codfilialretira = cart.saleStore;
+            //     itemPreOrder.codfilialretira = cart.saleStore;
-                itemPreOrder.poriginal = 0;
+            //     itemPreOrder.poriginal = 0;
-                itemPreOrder.pvendabase = 0;
+            //     itemPreOrder.pvendabase = 0;
-                itemPreOrder.pvenda1 = 0;
+            //     itemPreOrder.pvenda1 = 0;
-                itemPreOrder.tipoentrega = 'EF';
+            //     itemPreOrder.tipoentrega = 'EF';
-                console.log('Processo 3');
+            //     console.log('Processo 3');
 
-                await queryRunner.manager
+            //     await queryRunner.manager
-                    .createQueryBuilder()
+            //         .createQueryBuilder()
-                    .insert()
+            //         .insert()
-                    .into(Pcorcavendai)
+            //         .into(Pcorcavendai)
-                    .values(itemPreOrder)
+            //         .values(itemPreOrder)
-                    .execute();
+            //         .execute();
-                console.log('Processo 4');
+            //     console.log('Processo 4');
 
-                numeroSeq = numeroSeq + 1;
+            //     numeroSeq = numeroSeq + 1;
-            }
+            // }
 
             //#region create PCORCAVENDAC
             console.log('Processo 5' + cart);
@@ -201,7 +201,7 @@ export class PreOrderService {
             preOrder.minuto = new Date().getMinutes();
             preOrder.dtentrega = cart.shippingDate; // dateDelivery;
             preOrder.codfilial = cart.saleStore,
-            preOrder.codusur = ( idRca > 0 ) ? idRca : cart.idSeller;
+                preOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
             preOrder.codemitente = cart.userId;
             preOrder.codusur3 = cart.idProfessional;
             preOrder.tipoprioridadeentrega = cart.shippingPriority;
@@ -209,8 +209,8 @@ export class PreOrderService {
                 preOrder.codsupervisor = supervisor[0].codsupervisor;
             }
             preOrder.codemitente = cart.userId;
-            preOrder.vlfrete = cart.shippingValue;
+            preOrder.vlfrete = 0;
-            preOrder.vloutrasdesp = 0;
+            preOrder.vloutrasdesp = cart.shippingValue;
             preOrder.numitens = cart.itens.length;
             preOrder.obs1 = cart.notation1;
             preOrder.obs2 = cart.notation2;
@@ -352,11 +352,11 @@ export class PreOrderService {
                 sql += ` AND PCORCAVENDAC.NUMORCA = ${idPreOrder}  `;
             }
 
-            if ( document.length > 0 ) {
+            if (document.length > 0) {
                 sql += ` AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE(${document}, '[^0-9]', '')  `;
             }
 
-            if ( nameCustomer.length > 0 ) {
+            if (nameCustomer.length > 0) {
                 sql += ` AND PCCLIENT.CLIENTE LIKE UPPER('${nameCustomer}')||'%'  `;
             }
 
@@ -411,7 +411,7 @@ export class PreOrderService {
             }
 
             await queryRunner.query("BEGIN ESK_VENDA.ATUALIZAR_PRECO_VENDA(:idcart, :paymentPlanId); END;",
-                 [preOrder[0].cartId, preOrder[0].paymentPlanId]);
+                [preOrder[0].cartId, preOrder[0].paymentPlanId]);
 
             const invoiceStores = await this.listsService.GetStoreAll();
             const invoiceStore = await invoiceStores.find(data => data.id === preOrder[0].invoiceStore);
@@ -425,7 +425,7 @@ export class PreOrderService {
             }
             // const address = await this.addressCustomerService.getAddress(preOrder[0].customerId, preOrder[0].addressId);
             const billing = billinds.find(data => data.codcob === preOrder[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999');
+            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999', preOrder[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === preOrder[0].paymentPlanId);
             const partner = partners.find(data => data.id === preOrder[0].partnerId);
 

src/sales/sales/sales.service.ts

@@ -27,8 +27,39 @@ export class SalesService {
 
 
     async GetProducts2(store: string, pageSize: number, pageNumber: number, filter: FilterProduct = null,) {
-        const connectionDb = new Connection(connectionOptions);
+        const cacheKey = `GetProducts2:${store}:${pageSize}:${pageNumber}:${JSON.stringify(filter)}`;
-        await connectionDb.connect();
+        const lockKey = `lock:${cacheKey}`;
+        const lockTimeout = 30;
+
+        // Fase 1: Verificar cache Redis
+        try {
+            const cachedResult = await this.redisClient.get(cacheKey);
+            if (cachedResult) {
+                console.log('GetProducts2 - Retornando resultado do cache');
+                return JSON.parse(cachedResult);
+            }
+        } catch (err) {
+            console.error('Erro ao acessar o Redis no GetProducts2:', err?.message || err);
+        }
+
+        // Lock para evitar thundering herd
+        const lockValue = Date.now() + lockTimeout * 1000 + 1;
+        let acquiredLock: string | null = null;
+        try {
+            acquiredLock = await this.redisClient.set(lockKey, lockValue, 'NX', 'EX', lockTimeout);
+        } catch (err) {
+            console.error('Erro ao adquirir lock no Redis (GetProducts2):', err?.message || err);
+            acquiredLock = 'OK'; // Em caso de erro no Redis, prosseguir sem lock
+        }
+
+        if (acquiredLock !== 'OK') {
+            console.log('Lock não adquirido (GetProducts2), aguardando...');
+            await this.sleep(1000);
+            return this.GetProducts2(store, pageSize, pageNumber, filter);
+        }
+
+        // Fase 2: Reutilizar conexão via pool
+        const connectionDb = getConnection();
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
         try {
@@ -38,55 +69,11 @@ export class SalesService {
                 pageNumber = 1;
             const offSet = (pageNumber - 1) * pageSize;
 
-            const sqlProduto = `SELECT 
-                                    esvlistaprodutos.CODPROD as "idProduct",
-                                    esvlistaprodutos.SEQ as "seq",
-                                    esvlistaprodutos.DESCRICAO as "smallDescription",
-                                    esvlistaprodutos.NOMEECOMMERCE as "title",
-                                    esvlistaprodutos.CODFAB as "idProvider",
-                                    esvlistaprodutos.CODAUXILIAR as "ean",
-                                    esvlistaprodutos.TIPOPRODUTO as "productType",
-                                    esvlistaprodutos.DADOSTECNICOS as "technicalData",
-                                    esvlistaprodutos.INFORMACOESTECNICAS as "description",
-                                    esvlistaprodutos.URLIMAGEM as "urlImage",
-                                    esvlistaprodutos.NOMEMARCA as "brand",
-                                    esvlistaprodutos.NOMEDEPARTAMENTO as "department",
-                                    esvlistaprodutos.NOMESECAO as "section",
-                                    esvlistaprodutos.NOMECATEGORIA as "category",
-                                    esvlistaprodutos.NOMEFORNECEDOR as "supplier",
-                                    esvlistaprodutos.CODIGOFILIAL as "store",
-                                    esvlistaprodutos.CLASSEVENDA as "saleAbc",
-                                    esvlistaprodutos.CLASSEESTOQUE as "stockAbc",
-                                    esvlistaprodutos.FORALINHA as "outLine",
-                                    esvlistaprodutos.PRECOVENDA as "listPrice",
-                                    esvlistaprodutos.PRECOPROMOCIONAL as "salePrice",
-                                    esvlistaprodutos.PRECOPROMOCIONAL as "salePromotion",
-                                    esvlistaprodutos.PRECOPROMOCIONAL_AVISTA as "salePromotion_cash",
-                                    esvlistaprodutos.PERCENTUALDESCONTO as "offPercent",
-                                    esvlistaprodutos.QTESTOQUE_DISPONIVEL as "stock",
-                                    esvlistaprodutos.QTCAIXAS as "boxStock",
-                                    esvlistaprodutos.ESTOQUE_DISP_LOJA as "store_stock",
-                                    esvlistaprodutos.ESTOQUE_DISP_CAIXA_LOJA as "store_boxStock",
-                                    esvlistaprodutos.MULTIPLO as "mutiple",
-                                    esvlistaprodutos.UNIDADE as "unity",
-                                    esvlistaprodutos.URLDEPARTAMENTO as "urlDepartment",
-                                    esvlistaprodutos.URLSECAO as "urlSection",
-                                    esvlistaprodutos.PRODUTO_COM_REDUCAO_PRECO as "downPrice",
-                                    esvlistaprodutos.PRODUTO_EM_CAMPANHA as "compaing",
-                                    esvlistaprodutos.BASETINTOMETRICO as "base",
-                                    esvlistaprodutos.LETRABASETINTOMETRICO as "letter",
-                                    esvlistaprodutos.LINHATINTOMETRICO as "line",
-                                    esvlistaprodutos.LITRAGEM as "can",
-                                    esvlistaprodutos.QUANTIDADE_ESTOQUE_GERAL as "full_stock",
-                                    esvlistaprodutos.TEM_PRODUTO_SIMILAR as "similar",
-                                    NVL(esvlistaprodutos.TIPO, 'SEM') as "type_campaing"
-                                FROM ESVLISTAPRODUTOS
-                                WHERE 1 = 1 `;
-
             if (filter && filter.text.length > 0) {
                 const description = filter.text.toUpperCase();
-                console.log('consultando por codigo de fabrica');
+                console.log('consultando por texto: ' + description);
 
+                // Fase 3: Query unificada - busca por CODFAB OU DESCRICAO em uma única query
                 let products = await queryRunner.manager
                     .getRepository(SalesProduct)
                     .createQueryBuilder('esvlistaprodutos')
@@ -97,8 +84,6 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".CODFAB", "idProvider")
                     .addSelect("\"esvlistaprodutos\".CODAUXILIAR", "ean")
                     .addSelect("\"esvlistaprodutos\".TIPOPRODUTO", "productType")
-                    .addSelect("\"esvlistaprodutos\".DADOSTECNICOS", "technicalData")
-                    .addSelect("\"esvlistaprodutos\".INFORMACOESTECNICAS", "description")
                     .addSelect("\"esvlistaprodutos\".URLIMAGEM", "urlImage")
                     .addSelect("\"esvlistaprodutos\".NOMEMARCA", "brand")
                     .addSelect("\"esvlistaprodutos\".NOMEDEPARTAMENTO", "department")
@@ -125,19 +110,19 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
                     .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
                     .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
-                    .where("UPPER(\"esvlistaprodutos\".CODFAB) LIKE '%'||REPLACE(:description, '@', '%')||'%'", { description })
+                    .where("(UPPER(\"esvlistaprodutos\".CODFAB) LIKE '%'||REPLACE(:description, '@', '%')||'%' OR UPPER(\"esvlistaprodutos\".descricao) LIKE '%'||REPLACE(:description, '@', '%')||'%')", { description })
                     .andWhere("(\"esvlistaprodutos\".codfilial = :codfilial OR :codfilial = '99')", { codfilial: store })
                     .andWhere("(\"esvlistaprodutos\".produto_com_reducao_preco = :produtoComReducaoPreco OR :produtoComReducaoPreco = 'N')",
                         { produtoComReducaoPreco: (filter.markdown) ? 'S' : 'N' })
                     .andWhere("(\"esvlistaprodutos\".produto_em_campanha = :campaign OR :campaign = 'N')",
                         { campaign: (filter.campaign) ? 'I' : 'N' })
-                    .andWhere("(\"esvlistaprodutos\".produto_em_campanha = :oportunity OR :oportunity = 'N')",
+                    .andWhere("(\"esvlistaprodutos\".produto_oportunidade = :oportunity OR :oportunity = 'N')",
                         { oportunity: (filter.oportunity) ? 'O' : 'N' })
                     .andWhere("(\"esvlistaprodutos\".produto_em_promocao = :produtoEmPromocao OR :produtoEmPromocao = 'N')",
                         { produtoEmPromocao: (filter.promotion) ? 'S' : 'N' })
@@ -145,69 +130,9 @@ export class SalesService {
                     .offset(offSet)
                     .orderBy("\"esvlistaprodutos\".DESCRICAO", "ASC")
                     .getRawMany();
-                if (products.length == 0) {
-                    products = await queryRunner.manager
-                        .getRepository(SalesProduct)
-                        .createQueryBuilder('esvlistaprodutos')
-                        .select("\"esvlistaprodutos\".CODPROD", "idProduct")
-                        .addSelect("\"esvlistaprodutos\".SEQ", "seq")
-                        .addSelect("\"esvlistaprodutos\".DESCRICAO", "smallDescription")
-                        .addSelect("\"esvlistaprodutos\".NOMEECOMMERCE", "title")
-                        .addSelect("\"esvlistaprodutos\".CODFAB", "idProvider")
-                        .addSelect("\"esvlistaprodutos\".CODAUXILIAR", "ean")
-                        .addSelect("\"esvlistaprodutos\".TIPOPRODUTO", "productType")
-                        .addSelect("\"esvlistaprodutos\".DADOSTECNICOS", "technicalData")
-                        .addSelect("\"esvlistaprodutos\".INFORMACOESTECNICAS", "description")
-                        .addSelect("\"esvlistaprodutos\".URLIMAGEM", "urlImage")
-                        .addSelect("\"esvlistaprodutos\".NOMEMARCA", "brand")
-                        .addSelect("\"esvlistaprodutos\".NOMEDEPARTAMENTO", "department")
-                        .addSelect("\"esvlistaprodutos\".NOMESECAO", "section")
-                        .addSelect("\"esvlistaprodutos\".NOMECATEGORIA", "category")
-                        .addSelect("\"esvlistaprodutos\".NOMEFORNECEDOR", "supplier")
-                        .addSelect("\"esvlistaprodutos\".CODIGOFILIAL", "store")
-                        .addSelect("\"esvlistaprodutos\".CLASSEVENDA", "saleAbc")
-                        .addSelect("\"esvlistaprodutos\".CLASSEESTOQUE", "stockAbc")
-                        .addSelect("\"esvlistaprodutos\".FORALINHA", "outLine")
-                        .addSelect("\"esvlistaprodutos\".PRECOVENDA", "listPrice")
-                        .addSelect("\"esvlistaprodutos\".PRECOPROMOCIONAL", "salePrice")
-                        .addSelect("\"esvlistaprodutos\".PRECOPROMOCIONAL", "salePromotion")
-                        .addSelect("\"esvlistaprodutos\".PRECOPROMOCIONAL_AVISTA", "salePromotion_cash")
-                        .addSelect("\"esvlistaprodutos\".PERCENTUALDESCONTO", "offPercent")
-                        .addSelect("\"esvlistaprodutos\".QTESTOQUE_DISPONIVEL", "stock")
-                        .addSelect("\"esvlistaprodutos\".QTCAIXAS", "boxStock")
-                        .addSelect("\"esvlistaprodutos\".ESTOQUE_DISP_LOJA", "store_stock")
-                        .addSelect("\"esvlistaprodutos\".ESTOQUE_DISP_CAIXA_LOJA", "store_boxStock")
-                        .addSelect("\"esvlistaprodutos\".MULTIPLO", "mutiple")
-                        .addSelect("\"esvlistaprodutos\".UNIDADE", "unity")
-                        .addSelect("\"esvlistaprodutos\".URLDEPARTAMENTO", "urlDepartment")
-                        .addSelect("\"esvlistaprodutos\".URLSECAO", "urlSection")
-                        .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
-                        .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
-                        .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                        .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
-                        .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
-                        .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
-                        .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
-                        .addSelect("\"esvlistaprodutos\".TEM_PRODUTO_SIMILAR", "similar")
-                        .addSelect("\"esvlistaprodutos\".TIPO_CAMPANHA", "type_campaing")
-                        .where("UPPER(\"esvlistaprodutos\".descricao) LIKE '%'||REPLACE(:description, '@', '%')||'%'", { description })
-                        .andWhere("(\"esvlistaprodutos\".codfilial = :codfilial OR :codfilial = '99')", { codfilial: store })
-                        .andWhere("(\"esvlistaprodutos\".produto_com_reducao_preco = :produtoComReducaoPreco OR :produtoComReducaoPreco = 'N')",
-                            { produtoComReducaoPreco: (filter.markdown) ? 'S' : 'N' })
-                        .andWhere("(\"esvlistaprodutos\".produto_em_campanha = :campaign OR :campaign = 'N')",
-                            { campaign: (filter.campaign) ? 'I' : 'N' })
-                        .andWhere("(\"esvlistaprodutos\".produto_oportunidade = :oportunity OR :oportunity = 'N')",
-                            { oportunity: (filter.oportunity) ? 'O' : 'N' })
-                        .andWhere("(\"esvlistaprodutos\".produto_em_promocao = :produtoEmPromocao OR :produtoEmPromocao = 'N')",
-                            { produtoEmPromocao: (filter.promotion) ? 'S' : 'N' })
-                        .orderBy("\"esvlistaprodutos\".CLASSEVENDA")
-                        .limit(pageSize)
-                        .offset(offSet)
-                        .orderBy("\"esvlistaprodutos\".DESCRICAO", "ASC")
-                        .getRawMany();
-                }
                 products = this.createListImages(products);
                 console.log(products.length + ' produtos');
+                try { await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 900); } catch (cacheErr) { console.error('Erro ao salvar cache GetProducts2:', cacheErr?.message || cacheErr); }
                 return products;
             }
 
@@ -234,8 +159,6 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".CODFAB", "idProvider")
                     .addSelect("\"esvlistaprodutos\".CODAUXILIAR", "ean")
                     .addSelect("\"esvlistaprodutos\".TIPOPRODUTO", "productType")
-                    .addSelect("\"esvlistaprodutos\".DADOSTECNICOS", "technicalData")
-                    .addSelect("\"esvlistaprodutos\".INFORMACOESTECNICAS", "description")
                     .addSelect("\"esvlistaprodutos\".URLIMAGEM", "urlImage")
                     .addSelect("\"esvlistaprodutos\".NOMEMARCA", "brand")
                     .addSelect("\"esvlistaprodutos\".NOMEDEPARTAMENTO", "department")
@@ -262,7 +185,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -285,6 +208,7 @@ export class SalesService {
                     .getRawMany();
                 products = this.createListImages(products);
                 console.log(products.length + ' produtos');
+                try { await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 900); } catch (cacheErr) { console.error('Erro ao salvar cache GetProducts2:', cacheErr?.message || cacheErr); }
                 return products;
 
             } else {
@@ -300,8 +224,6 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".CODFAB", "idProvider")
                     .addSelect("\"esvlistaprodutos\".CODAUXILIAR", "ean")
                     .addSelect("\"esvlistaprodutos\".TIPOPRODUTO", "productType")
-                    .addSelect("\"esvlistaprodutos\".DADOSTECNICOS", "technicalData")
-                    .addSelect("\"esvlistaprodutos\".INFORMACOESTECNICAS", "description")
                     .addSelect("\"esvlistaprodutos\".URLIMAGEM", "urlImage")
                     .addSelect("\"esvlistaprodutos\".NOMEMARCA", "brand")
                     .addSelect("\"esvlistaprodutos\".NOMEDEPARTAMENTO", "department")
@@ -328,7 +250,7 @@ export class SalesService {
                     .addSelect("\"esvlistaprodutos\".PRODUTO_COM_REDUCAO_PRECO", "downPrice")
                     .addSelect("\"esvlistaprodutos\".PRODUTO_EM_CAMPANHA", "compaing")
                     .addSelect("\"esvlistaprodutos\".BASETINTOMETRICO", "base")
-                    .addSelect("\"esvlistaprodutos\".LETRATINTOMETRICO", "letter")
+                    .addSelect("\"esvlistaprodutos\".LETRABASETINTOMETRICO", "letter")
                     .addSelect("\"esvlistaprodutos\".LINHATINTOMETRICO", "line")
                     .addSelect("\"esvlistaprodutos\".LITRAGEM", "can")
                     .addSelect("\"esvlistaprodutos\".QUANTIDADE_ESTOQUE_GERAL", "full_stock")
@@ -349,6 +271,7 @@ export class SalesService {
                     .getRawMany();
                 products = this.createListImages(products);
                 console.log(products.length + ' produtos');
+                try { await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 900); } catch (cacheErr) { console.error('Erro ao salvar cache GetProducts2:', cacheErr?.message || cacheErr); }
                 return products;
 
             }
@@ -357,7 +280,15 @@ export class SalesService {
             throw error;
         } finally {
             await queryRunner.release();
-            await connectionDb.close();
+            // Não fecha a conexão - reutilizada pelo pool
+            try {
+                const currentLockValue = await this.redisClient.get(lockKey);
+                if (currentLockValue === lockValue.toString()) {
+                    await this.redisClient.del(lockKey);
+                }
+            } catch (lockErr) {
+                console.error('Erro ao liberar lock Redis (GetProducts2):', lockErr?.message || lockErr);
+            }
         }
     }
 
@@ -957,6 +888,9 @@ export class SalesService {
                                 FROM ESVESTOQUEVENDA, PCFILIAL
                             WHERE ESVESTOQUEVENDA.CODPROD = ${id}
                               AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO
+                              AND EXISTS(SELECT 1 FROM PCFILIALRETIRA R
+                                           WHERE R.CODFILIALVENDA = '${storeId}'
+                                             AND R.CODFILIALRETIRA = ESVESTOQUEVENDA.CODFILIAL)                              
                             ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `;
 
             const stock = await queryRunner.query(sql);
@@ -1111,17 +1045,18 @@ export class SalesService {
     }
 
     createListImages(products: SalesProduct[]): SalesProduct[] {
-        products.forEach(product => {
+        for (let i = 0; i < products.length; i++) {
+            const product = products[i];
             product.images = [];
-            if (product.urlImage != null) {
+            if (product.urlImage != null && product.urlImage.length > 0) {
-                let urlImage = product.urlImage;
+                product.images = product.urlImage
-                if (urlImage.indexOf(";") == -1) {
+                    .split(';')
-                    urlImage += ";";
+                    .map(img => img.trim())
-                }
+                    .filter(img => img.length > 0);
-                const images = product.urlImage.split(";");
-                product.images = images.map(i => i.trim());
             }
-        });
+            // Adiciona thumbnail para acesso rápido no frontend
+            (product as any).thumbnail = product.images.length > 0 ? product.images[0] : null;
+        }
         return products;
     }
 
@@ -1412,8 +1347,7 @@ export class SalesService {
         const skipReg = ((pageNumber - 1) * pageSize);
         const pagination = ` OFFSET ${skipReg} ROWS FETCH NEXT ${pageSize} ROWS ONLY`;
 
-        const connectionDb = new Connection(connectionOptions);
+        const connectionDb = getConnection();
-        await connectionDb.connect();
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
 
@@ -1422,7 +1356,7 @@ export class SalesService {
             products = this.createListImages(products);
             console.log("Total de produtos: " + products.length);
 
-            await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 3600);
+            await this.redisClient.set(cacheKey, JSON.stringify(products), 'EX', 900);
 
             return products;
         } catch (err) {
@@ -1430,7 +1364,7 @@ export class SalesService {
             throw err;
         } finally {
             await queryRunner.release();
-            await connectionDb.close();
+            // Não fecha a conexão - reutilizada pelo pool
         }
     }
 
@@ -1448,7 +1382,7 @@ export class SalesService {
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"     ' +
+            /*const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"     ' +
                 '       ,ESVCALCULOFRETE.CODFILIAL      as "store"              ' +
                 '       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             ' +
                 '       ,PCCIDADE.NOMECIDADE            as "cityName"           ' +
@@ -1462,7 +1396,22 @@ export class SalesService {
                 '   AND ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          ' +
                 '   AND ESVCALCULOFRETE.CODCIDADE = :1          ' +
                 '   AND ESVCALCULOFRETE.IDCART = :2             ' +
-                ' ORDER BY VLFRETE';
+                ' ORDER BY VLFRETE';*/
+
+            const sql = `SELECT  0 as "id"     
+                       ,'1'                            as "store"              
+                       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             
+                       ,PCCIDADE.NOMECIDADE            as "cityName"           
+                       ,NULL                           as "carrierId"          
+                       ,'SIMPLIFIQUE HOMECENTER'       as "carrierName"        
+                       ,0                              as "minSale"            
+                       ,ESVCALCULOFRETE.VLFRETE        as "deliveryValue"      
+                       ,NULL                           as "deliveryTime"       
+                  FROM ESVCALCULOFRETE, PCCIDADE                     
+                 WHERE ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          
+                   AND ESVCALCULOFRETE.CODCIDADE = :1          
+                   AND ESVCALCULOFRETE.IDCART = :2            
+                 ORDER BY VLFRETE`;
 
             const deliveryTaxTable = await queryRunner.manager
                 .query(sql, [cityId, cartId]);
@@ -1506,7 +1455,7 @@ export class SalesService {
         await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery);
 
         if (cityId == 0) {
-            cityId = Number.parseInt(dataDeliveryTax.ibgeCode);
+            cityId = Number.parseInt(dataDeliveryTax.ibgeCode ?? dataDeliveryTax.cityId);
             // throw new HttpException('Cidade não localiza para cálculo da taxa de entrega', HttpStatus.BAD_REQUEST);
         }
         const connectionDb = new Connection(connectionOptions);
@@ -1514,7 +1463,22 @@ export class SalesService {
         const queryRunner = connectionDb.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"             ' +
+            const sql = `SELECT  0 as "id"     
+                       ,'1'                            as "store"              
+                       ,ESVCALCULOFRETE.CODCIDADE      as "cityId"             
+                       ,PCCIDADE.NOMECIDADE            as "cityName"           
+                       ,NULL                           as "carrierId"          
+                       ,'SIMPLIFIQUE HOMECENTER'       as "carrierName"        
+                       ,0                              as "minSale"            
+                       ,ESVCALCULOFRETE.VLFRETE        as "deliveryValue"      
+                       ,NULL                           as "deliveryTime"       
+                  FROM ESVCALCULOFRETE, PCCIDADE                     
+                 WHERE ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE          
+                   AND ESVCALCULOFRETE.CODCIDADE = :1          
+                   AND ESVCALCULOFRETE.IDCART = :2            
+                 ORDER BY VLFRETE`;
+
+            /*const sql = 'SELECT  ESVCALCULOFRETE.CODTABELAFRETE as "id"             ' +
                 '       ,ESVCALCULOFRETE.CODFILIAL          as "store"              ' +
                 '       ,ESVCALCULOFRETE.CODCIDADE          as "cityId"             ' +
                 '       ,PCCIDADE.NOMECIDADE                as "cityName"           ' +
@@ -1528,7 +1492,7 @@ export class SalesService {
                 '   AND ESVCALCULOFRETE.CODCIDADE = PCCIDADE.CODCIDADE              ' +
                 '   AND ESVCALCULOFRETE.CODCIDADE = :1                              ' +
                 '   AND ESVCALCULOFRETE.IDCART = :2                                 ' +
-                ' ORDER BY VLFRETE';
+                ' ORDER BY VLFRETE';*/
 
             let deliveryTaxTable = await queryRunner.manager
                 .query(sql, [dataDeliveryTax.cityId, dataDeliveryTax.cartId]);
@@ -1583,7 +1547,7 @@ export class SalesService {
             // const sql = `SELECT ESF_CALCULAR_PRAZO_ENTREGA(TO_DATE('${saleDate}', 'DD-MM-YYYY')) AS "days" FROM DUAL`;
             const timeDays = await queryRunner.query(sql);
 
-            const sqlRetiraPosterior = `SELECT ( PROXIMO_DIA_UTIL(TO_DATE('${saleDate}', 'DD-MM-YYYY'), '4') - TRUNC(SYSDATE) ) AS "days" FROM DUAL`;
+            const sqlRetiraPosterior = `SELECT ( PROXIMO_DIA_UTIL(TO_DATE('${saleDate}', 'DD-MM-YYYY'), '1') - TRUNC(SYSDATE) ) AS "days" FROM DUAL`;
             const timeDaysRetiraPosterior = await queryRunner.query(sqlRetiraPosterior);
 
             return { deliveryDays: timeDays[0].days, retiraPosteriorDays: timeDaysRetiraPosterior[0].days };

src/sales/shopping/shopping.controller.ts

@@ -6,15 +6,16 @@ import { OrderDiscount } from 'src/domain/models/order-discount.model';
 import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model';
 import { LogOrder } from 'src/domain/models/log-order.model';
 import { ApiTags } from '@nestjs/swagger';
+import { Cart } from 'src/domain/models/cart.model';
 
 @ApiTags('Shopping')
 @Controller('api/v1/shopping')
 export class ShoppingController {
 
-    constructor(private shoppingService: ShoppingService){}
+    constructor(private shoppingService: ShoppingService) { }
 
     @Get('cart/:id')
-    async getCart(@Param('id') id: string){
+    async getCart(@Param('id') id: string) {
         try {
             const cart = await this.shoppingService.GetItensCart(id);
             if (cart == null || cart.length == 0)
@@ -27,10 +28,10 @@ export class ShoppingController {
     }
 
     @Get(':id')
-    async getPreVenda(@Param('id') id: string ){
+    async getPreVenda(@Param('id') id: string) {
         try {
             const cart = await this.shoppingService.getShopping(id);
-            if (cart == null )
+            if (cart == null)
                 throw new HttpException("Carrinho de compras não encontrado", HttpStatus.NOT_FOUND);
             return cart;
         } catch (error) {
@@ -39,15 +40,24 @@ export class ShoppingController {
         }
     }
 
+    @Put('cart')
+    async updateCart(@Body() cart: Cart) {
+        try {
+            return await this.shoppingService.updateShopping(cart);
+        } catch (error) {
+            throw new HttpException(error.message, HttpStatus.BAD_REQUEST);
+        }
+    }
+
     @Get('cart/:idcart/item/:idProduct/tipoentrega/:deliveryType')
     async getItemCart(@Req() request, @Param('idCart') idCart: string,
-                     @Param('idProduct') idProduct: string, @Param('deliveryType') deliveryType: string){
+        @Param('idProduct') idProduct: string, @Param('deliveryType') deliveryType: string) {
         let store = '99';
         try {
             if (request.headers['x-store'])
                 store = request.headers['x-store'];
             const cart = await this.shoppingService.getItemCart(idCart, idProduct, store, deliveryType);
-            if (cart == null )
+            if (cart == null)
                 throw new HttpException("Item não foi encontrado no carrinho de compras.", HttpStatus.NOT_FOUND);
             return cart;
         } catch (error) {
@@ -57,8 +67,8 @@ export class ShoppingController {
     }
 
     @Get('cart/lot/:productId/:customerId')
-    async getLotProduct( @Req() request, @Param('productId') productId: number,
+    async getLotProduct(@Req() request, @Param('productId') productId: number,
-                         @Param('customerId') customerId: number ) {
+        @Param('customerId') customerId: number) {
         let store = '99';
         try {
             if (request.headers['x-store'])
@@ -73,7 +83,7 @@ export class ShoppingController {
 
 
     @Post('item')
-    async createItemShopping(@Body() item: ShoppingItem){
+    async createItemShopping(@Body() item: ShoppingItem) {
         console.log('createItemShopping')
         try {
             return await this.shoppingService.createItemCart(item);
@@ -83,7 +93,7 @@ export class ShoppingController {
     }
 
     @Post('log')
-    async logOrderShopping(@Body() logOrder: LogOrder){
+    async logOrderShopping(@Body() logOrder: LogOrder) {
         try {
             console.log('logOrderShopping')
             return await this.shoppingService.createLogShopping(logOrder);
@@ -93,10 +103,10 @@ export class ShoppingController {
     }
 
     @Put('item')
-    async updateQuantityItem(@Body() item: ShoppingItem){
+    async updateQuantityItem(@Body() item: ShoppingItem) {
         console.log(item);
         try {
-            if (item.id == null){
+            if (item.id == null) {
                 throw new HttpException('Item sem Id informado, faça a inclusão do item no carrinho.', HttpStatus.BAD_REQUEST);
             }
             const itemCreate = await this.shoppingService.updateItem(item);
@@ -107,10 +117,10 @@ export class ShoppingController {
     }
 
     @Put('item/discount')
-    async updatePriceItem(@Body() item: ShoppingItem){
+    async updatePriceItem(@Body() item: ShoppingItem) {
         console.log(item);
         try {
-            if (item.id == null){
+            if (item.id == null) {
                 throw new HttpException('Item sem Id informado, faça a inclusão do item no carrinho.', HttpStatus.BAD_REQUEST);
             }
             const itemCreate = await this.shoppingService.updatePrice(item);
@@ -142,7 +152,7 @@ export class ShoppingController {
     }
 
     @Delete('item/delete/:id')
-    async deleteItem(@Param('id') id: string){
+    async deleteItem(@Param('id') id: string) {
         try {
             await this.shoppingService.deleteItem(id);
             return new ResultModel(true, 'Item excluído com sucesso!', id, null,);
@@ -165,4 +175,4 @@ export class ShoppingController {
     }
 
 
- }
+}

src/sales/shopping/shopping.service.ts

@@ -8,6 +8,7 @@ import { Shopping } from 'src/domain/entity/tables/estprevendac.entity';
 import { OrderTaxDelivery } from 'src/domain/models/order-taxdelivery.model';
 import { connectionOptions } from 'src/configs/typeorm.config';
 import { LogOrder } from 'src/domain/models/log-order.model';
+import { Cart } from 'src/domain/models/cart.model';
 
 @Injectable()
 export class ShoppingService {
@@ -167,7 +168,7 @@ export class ShoppingService {
                                                               AND E.CODFILIAL = '${itemShopping.stockStore}'`);
 
             let quantityStock = 0;
-            if ( dataStockItem.length > 0 ) {
+            if (dataStockItem.length > 0) {
                 quantityStock = dataStockItem[0].quantityStock;
             }
 
@@ -605,6 +606,39 @@ export class ShoppingService {
         }
     }
 
+    async updateShopping(shopping: any) {
+        const connection = new Connection(connectionOptions);
+        await connection.connect();
+        const queryRunner = connection.createQueryRunner();
+        await queryRunner.connect();
+        try {
+            console.log(JSON.stringify(shopping));
+            const sql = `UPDATE ESTPREVENDAC
+                            SET ESTPREVENDAC.CODCLI        = :codcli
+                                ,ESTPREVENDAC.codendentcli = :codendentcli
+                                ,ESTPREVENDAC.codplpag     = :codplpag
+                                ,ESTPREVENDAC.codcob       = :codcob
+                                ,ESTPREVENDAC.codfilial    = :codfilial
+                            WHERE ID = :id    `;
+
+            await queryRunner.query(sql, [
+                shopping.codcli,
+                shopping.codendentcli,
+                shopping.codplpag,
+                shopping.codcob,
+                shopping.saleStore,
+                shopping.id
+            ]);
+
+            return shopping;
+        } catch (error) {
+            throw error;
+        } finally {
+            await queryRunner.release();
+            await connection.close();
+        }
+    }
+
     async updatePriceShopping(idCart: string, idPaymentPlan: number) {
         const connection = new Connection(connectionOptions);
         await connection.connect();