teste2

.gitea/workflows/deploy-api.yaml

@@ -0,0 +1,30 @@
+name: Deploy NestJS API
+on: [push]
+
+jobs:
+  build-and-push-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Login no Harbor
+        run: |
+          echo "${{ secrets.HARBOR_PASSWORD }}" | docker login 10.1.1.124:8082 -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
+
+      - name: Build e Push
+        run: |
+          # Usando o short SHA para uma tag mais limpa
+          TAG=$(echo ${{ gitea.sha }} | cut -c1-7)
+          IMAGE_NAME="10.1.1.124:8082/library/vendaweb-api"
+          
+          docker build -t $IMAGE_NAME:$TAG .
+          docker tag $IMAGE_NAME:$TAG $IMAGE_NAME:latest
+          
+          docker push $IMAGE_NAME:$TAG
+          docker push $IMAGE_NAME:latest
+          
+      - name: Notificar Portainer via Webhook
+        run: |
+          # O segredo PORTAINER_WEBHOOK_VENDAWEBAPI deve conter a URL completa gerada na Stack
+          curl -f -X POST "${{ secrets.PORTAINER_WEBHOOK_VENDAWEBAPI }}"

.gitignore

@@ -33,3 +33,5 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 
+postgres-data/
+.env

.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "cweijan.dbclient-jdbc"
-  ]
-}

Dockerfile

@@ -1,32 +1,24 @@
-FROM node:16
+FROM node:16-bullseye-slim AS builder
+WORKDIR /app
+COPY package*.json ./
+RUN npm install --legacy-peer-deps
+COPY . .
+RUN npm run build
 
+FROM node:16-bullseye-slim
+RUN apt-get update && apt-get install -y libaio1 unzip wget && mkdir -p /opt/oracle
 
-RUN apt-get update && apt-get install -y \
+RUN wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/client.zip && \
-    apt-transport-https \
+    unzip /opt/oracle/client.zip -d /opt/oracle && \
-    ca-certificates \
+    rm /opt/oracle/client.zip && \
-    libaio1 \
+    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient
-    unzip \
-    wget \
-    libc6 \
-    libncurses5 && \
-    mkdir -p /opt/oracle && \
-    wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linuxx64.zip -O /opt/oracle/instantclient-basic-linuxx64.zip && \
-    unzip /opt/oracle/instantclient-basic-linuxx64.zip -d /opt/oracle && \
-    rm /opt/oracle/instantclient-basic-linuxx64.zip && \
-    ln -s /opt/oracle/instantclient_* /opt/oracle/instantclient && \
-    echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && \
-    ldconfig
-
 
+ENV LD_LIBRARY_PATH=/opt/oracle/instantclient
 WORKDIR /app
 
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/package*.json ./
+COPY --from=builder /app/node_modules ./node_modules
 
-COPY package*.json ./
+EXPOSE 8068
-
-
-RUN npm install  --legacy-peer-deps
-
-COPY . .
-
-
 CMD ["npm", "run", "start:prod"]

docker-compose.yml

@@ -1,14 +1,18 @@
 version: '3.8'
 
 services:
-  vendaweb:
+  vendaweb-api:
-    image: link70/vendaweb
+    image: 10.1.1.124:8082/library/vendaweb-api:latest
-    deploy:
-      replicas: 20
-      resources:
-        limits:
-          cpus: '0.5'
-          memory: 512M
     ports:
-      - "8065:8065"
+      - "8068:8068"
-    restart: always 
+    networks:
+      - simplifique-network
+    deploy:
+      replicas: 4
+      update_config:
+        order: start-first 
+        parallelism: 1
+
+networks:
+  simplifique-network:
+    external: true

src/app.controller.ts

@@ -1,5 +1,5 @@
 import { Controller, Get } from '@nestjs/common';
-import { ApiTags, ApiOperation } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { APP_VERSION } from './version';
 
 @ApiTags('Main')
@@ -14,7 +14,7 @@ export class AppController {
 @Get('health')
 @ApiOperation({ summary: 'Health check' })
 healthCheck() {
-  return { status: 'ok' };
+  return { status: 'TESTE COM Felipe2 ' };
 }
 
 }

src/configs/typeorm.config.ts

@@ -2,17 +2,17 @@ import { TypeOrmModuleOptions } from '@nestjs/typeorm';
 import { ConnectionOptions } from 'typeorm';
 
 export const typeOrmConfig: TypeOrmModuleOptions = {
-  type: 'oracle',
+  type: "oracle",
   //  host: "192.168.100.40", 
   //  username: "LIVIA",  
   //  password: "LIVIA", 
-  host: '10.1.1.241',
+  host: "10.1.1.241",
-  username: 'SEVEN',
+  username: "teste",
-  password: 'USR54SEV',
+  password: "teste",
   // username: "API", 
   // password: "E05H5KIEQV3YKDJR", 
   port: 1521,
-  serviceName: 'WINT',
+  sid: "BDTESTE",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],
@@ -20,13 +20,14 @@ export const typeOrmConfig: TypeOrmModuleOptions = {
 };
 
 export const connectionOptions: ConnectionOptions = {
-  type: 'oracle',
+  type: "oracle",
-  host: '10.1.1.241',
+  host: "10.1.1.241",
-  username: 'SEVEN',
+  username: "teste",
-  password: 'USR54SEV',
+  password: "teste",
   port: 1521,
-  serviceName: 'WINT',
+  sid: "BDTESTE",
   synchronize: false,
   logging: false,
   entities: [__dirname + '/../**/*.entity.{js,ts}'],
-};
+}
+

src/domain/entity/tables/estprevendac.entity.ts

@@ -60,7 +60,4 @@ export class Shopping {
     @Column({ name: 'CODTABELAFRETE' })
     codtabelafrete: number;
 
-    @Column({ name: 'CODPRACA' })
-    codpraca: number;
-
 }

src/domain/models/cart-update.model.ts

@@ -1,24 +0,0 @@
-export class CartUpdate {
-    constructor(
-        public id: string,
-        public idCustomer: number,
-        public idAddress: number,
-        public saleStore: string,
-        public userId: number,
-        public idSeller: number,
-        public idProfessional: number,
-        public idPaymentPlan: number,
-        public idBilling: string,
-        public shippingValue: number,
-        public scheduleDelivery: boolean,
-        public shippingDate: Date,
-        public shippingPriority: string,
-        public idStorePlace: number,
-        public notation1: string,
-        public notation2: string,
-        public deliveryNote1: string,
-        public deliveryNote2: string,
-        public deliveryNote3: string,
-        public carrierId: number,
-    ) { }
-}

src/main.ts

@@ -20,6 +20,6 @@ async function bootstrap() {
     .build();
   const document = SwaggerModule.createDocument(app, options);
   SwaggerModule.setup("docs", app, document);
-  await app.listen(8065);
+await app.listen(8068, '0.0.0.0');}
-}
+console.log('API rodando na porta 8065 test 4');
 bootstrap();

src/sales/customer/customer.service.ts

@@ -360,8 +360,9 @@ export class CustomerService {
       newCustomer.longitude = customer.longitude;
       newCustomer.tipoendereco = customer.addressType;
 
-      const oldCustomer = await this.findCustomerByCpf(newCustomer.cgcent);
+      const oldCustomers = await this.findCustomerByCpf(newCustomer.cgcent);
-      if (oldCustomer) {
+      if (oldCustomers && oldCustomers.length > 0) {
+        const oldCustomer = oldCustomers[0];
         console.log('Cliente localizado: ' + oldCustomer.customerId);
         newCustomer.codcli = oldCustomer.customerId;
         await this.updateCustomer(newCustomer);

src/sales/order/order.service.ts

@@ -1,22 +1,24 @@
 /* eslint-disable @typescript-eslint/camelcase */
-import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable,Inject } from '@nestjs/common';
-import { ListsService } from 'src/backoffice/lists/lists.service';
-import { connectionOptions } from 'src/configs/typeorm.config';
 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';
-import { Pcpeditemp } from 'src/domain/entity/tables/pcpeditemp.entity';
-import { Cart } from 'src/domain/models/cart.model';
 import { Connection, QueryRunner } from 'typeorm';
 import { Pcclient } from '../../domain/entity/tables/pcclient.entity';
+import { Pcpeditemp } from 'src/domain/entity/tables/pcpeditemp.entity';
+import { Cart } from 'src/domain/models/cart.model';
 import { Pcpedc } from '../../domain/entity/tables/pcpedc.entity';
-import { AddressCustomerService } from '../address-customer/address-customer.service';
+import { connectionOptions } from 'src/configs/typeorm.config';
+import { ListsService } from 'src/backoffice/lists/lists.service';
 import { CustomerService } from '../customer/customer.service';
+import { AddressCustomerService } from '../address-customer/address-customer.service';
 import { ShoppingService } from '../shopping/shopping.service';
 import Redis = require('ioredis');
 
+
 @Injectable()
 export class OrderService {
+
     constructor(
         @Inject('REDIS_CLIENT') private readonly redisClient: Redis.Redis,
         private readonly listsService: ListsService,
@@ -28,10 +30,7 @@ export class OrderService {
     async create(cart: Cart) {
         const shopping = await this.findShopping(cart.id);
         if (shopping == null)
-      throw new HttpException(
+            throw new HttpException("Carrinho de compras não localizado.", HttpStatus.NOT_FOUND);
-        'Carrinho de compras não localizado.',
-        HttpStatus.NOT_FOUND,
-      );
         const order = await this.createOrder(cart);
         return order;
     }
@@ -43,27 +42,17 @@ export class OrderService {
         await queryRunner.connect();
 
         try {
-      const orderCancel = await queryRunner.query(
+            const orderCancel = await queryRunner.query('SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :NUMPED', [orderId]);
-        'SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :NUMPED',
-        [orderId],
-      );
 
             if (orderCancel !== null && orderCancel.length > 0) {
                 await queryRunner.startTransaction();
-        await queryRunner.query(
+                await queryRunner.query("UPDATE PCPEDC SET VENDAASSISTIDA = 'N', RESERVAESTOQUETV7 = 'N' WHERE NUMPEDENTFUT = :1", [orderId]);
-          "UPDATE PCPEDC SET VENDAASSISTIDA = 'N', RESERVAESTOQUETV7 = 'N' WHERE NUMPEDENTFUT = :1",
-          [orderId],
-        );
                 await queryRunner.commitTransaction();
-        const ordersDelivery = await queryRunner.query(
+                const ordersDelivery = await queryRunner
-          'SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPEDENTFUT = :1',
+                    .query("SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPEDENTFUT = :1", [orderId]);
-          [orderId],
-        );
                 for (const orderDelivery of ordersDelivery) {
-          await queryRunner.query(
+                    await queryRunner
-            'BEGIN ESK_VENDA.CANCELAR_PEDIDO(:1, :2); END;',
+                        .query("BEGIN ESK_VENDA.CANCELAR_PEDIDO(:1, :2); END;", [orderDelivery.numped, userId]);
-            [orderDelivery.numped, userId],
-          );
                 }
             }
         } catch (erro) {
@@ -81,6 +70,7 @@ export class OrderService {
     }
 
     async createOrder(cart: Cart) {
+
         const prevenda = await this.shoppingService.getShopping(cart.id);
         let idPreOrder = 0;
         cart.idSeller = prevenda.codusur;
@@ -96,28 +86,20 @@ export class OrderService {
         await queryRunner.connect();
 
         try {
+
             if (prevenda.numped > 0) {
                 // await this.deleteOrdersDelivery(prevenda.numped, cart.userId);
-        const orders = await queryRunner.query(
+                const orders = await queryRunner.query('SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :NUMPED', [prevenda.numped]);
-          'SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :NUMPED',
-          [prevenda.numped],
-        );
                 if (orders !== null && orders.length > 0) {
-          await queryRunner.query(
+                    await queryRunner
-            'BEGIN ESK_VENDA.CANCELAR_PEDIDO(:1, :2); END;',
+                        .query("BEGIN ESK_VENDA.CANCELAR_PEDIDO(:1, :2); END;", [prevenda.numped, cart.userId]);
-            [prevenda.numped, cart.userId],
+                    const orderCancel = await queryRunner
-          );
+                        .query('SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :1', [prevenda.numped]);
-          const orderCancel = await queryRunner.query(
-            'SELECT PCPEDC.NUMPED FROM PCPEDC WHERE NUMPED = :1',
-            [prevenda.numped],
-          );
                     if (orderCancel.length > 0) {
-            throw new HttpException(
+                        throw new HttpException('Não foi possível alterar o pedido de venda, verifique se o pedido já não encontra-se FATURADO ou em SEPARAÇÃO.', HttpStatus.BAD_REQUEST);
-              'Não foi possível alterar o pedido de venda, verifique se o pedido já não encontra-se FATURADO ou em SEPARAÇÃO.',
-              HttpStatus.BAD_REQUEST,
-            );
                     }
                 }
+
             }
 
             //  if ( prevenda.codcli === null || prevenda.codcli === 1){
@@ -126,30 +108,20 @@ export class OrderService {
 
             const preOrder = await this.createPreOrder(cart, idPreOrder);
 
-      await queryRunner.query(
+            await queryRunner
-        'BEGIN IMPORTARVENDAS.IMPORTARPEDIDOWEB(:preOrder, :idSeller); END;',
+                .query("BEGIN IMPORTARVENDAS.IMPORTARPEDIDOWEB(:preOrder, :idSeller); END;", [preOrder.numpedrca, preOrder.codusur]);
-        [preOrder.numpedrca, preOrder.codusur],
-      );
 
             const order = await queryRunner.manager
                 .getRepository(Pcpedc)
                 .createQueryBuilder('pcpedc')
-        .where(
+                .where("\"pcpedc\".numpedrca = :idPreOrder AND \"pcpedc\".CONDVENDA IN  (1,7)", { idPreOrder: preOrder.numpedrca })
-          '"pcpedc".numpedrca = :idPreOrder AND "pcpedc".CONDVENDA IN  (1,7)',
-          { idPreOrder: preOrder.numpedrca },
-        )
                 .getOne();
 
             if (!order) {
-        const logPreOrder = await queryRunner.query(
+                const logPreOrder = await queryRunner.query('SELECT PCPEDCTEMP.NUMPEDRCA, PCPEDCTEMP.observacao_pc as \"resultado\" FROM PCPEDCTEMP WHERE PCPEDCTEMP.NUMPEDRCA = :idPreOrder',
-          'SELECT PCPEDCTEMP.NUMPEDRCA, PCPEDCTEMP.observacao_pc as "resultado" FROM PCPEDCTEMP WHERE PCPEDCTEMP.NUMPEDRCA = :idPreOrder',
+                    [preOrder.numpedrca]);
-          [preOrder.numpedrca],
-        );
                 console.log(JSON.stringify(logPreOrder));
-        throw new HttpException(
+                throw new HttpException('Erro ao gerar pedido de venda - ' + logPreOrder[0].resultado, HttpStatus.INTERNAL_SERVER_ERROR);
-          'Erro ao gerar pedido de venda - ' + logPreOrder[0].resultado,
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
             }
 
             if (queryRunner.isTransactionActive) {
@@ -159,13 +131,11 @@ export class OrderService {
             await queryRunner.startTransaction();
             try {
                 // Atualizar numero do pedido na tabela de pre venda para
-        let sql =
+                let sql = ` UPDATE ESTPREVENDAC SET NUMPED = ${order.numped} ` +
-          ` UPDATE ESTPREVENDAC SET NUMPED = ${order.numped} ` +
                     `  WHERE ESTPREVENDAC.ID = '${cart.id}' `;
                 await queryRunner.query(sql);
 
-        sql =
+                sql = `UPDATE PCORCAVENDAC SET ORCAMENTOUTILIZADO = 'S' ` +
-          `UPDATE PCORCAVENDAC SET ORCAMENTOUTILIZADO = 'S' ` +
                     `                       ,NUMPED = ${order.numped} ` +
                     ` WHERE PCORCAVENDAC.NUMORCA = ( SELECT ESTPREVENDAC.NUMORCA FROM ESTPREVENDAC WHERE ID = '${cart.id}' )  `;
                 await queryRunner.query(sql);
@@ -173,8 +143,8 @@ export class OrderService {
                 //  await queryRunner
                 //      .query("BEGIN ESK_VENDA.RESERVA_PIGMENTO_TINTOMETRICO(:1); END;", [cart.id]);
 
-        sql =
+
-          `UPDATE PCPEDC SET ` +
+                sql = `UPDATE PCPEDC SET ` +
                     `                   POSICAO = 'L' ` +
                     `                 , MOTIVOPOSICAO = NULL ` +
                     `                 , CODMOTIVO = NULL ` +
@@ -195,9 +165,9 @@ export class OrderService {
                     `                  OR EXISTS(SELECT PCCOB.CODCOB FROM PCCOB ` +
                     `                                               WHERE PCCOB.CODCOB = PCPEDC.CODCOB ` +
                     `                                                 AND NVL(PCCOB.CARTAO,'N') = 'S') ) `;
-        await queryRunner.manager.query(sql, [order.numped]);
+                await queryRunner.manager
-        sql =
+                    .query(sql, [order.numped]);
-          `UPDATE PCPEDI SET POSICAO = 'L' WHERE NUMPED = :1 ` +
+                sql = `UPDATE PCPEDI SET POSICAO = 'L' WHERE NUMPED = :1 ` +
                     ` AND EXISTS( SELECT PCPEDC.NUMPED FROM PCPEDC ` +
                     `              WHERE PCPEDC.NUMPED = PCPEDI.NUMPED ` +
                     `                AND NOT EXISTS(SELECT PCBLOQUEIO.CODMOTBLOQUEIO FROM PCBLOQUEIO WHERE PCBLOQUEIO.CODCOB = PCPEDC.CODCOB) ` +
@@ -205,12 +175,13 @@ export class OrderService {
                     `                       OR EXISTS(SELECT PCCOB.CODCOB FROM PCCOB ` +
                     `                                  WHERE PCCOB.CODCOB = PCPEDC.CODCOB   ` +
                     `                                    AND NVL(PCCOB.CARTAO,'N') = 'S') ) )`;
-        await queryRunner.manager.query(sql, [order.numped]);
+                await queryRunner.manager
+                    .query(sql, [order.numped]);
 
                 await this.updateStatusItem(queryRunner, order.numped);
 
-        sql =
+
-          ` UPDATE PCPEDC SET ` +
+                sql = ` UPDATE PCPEDC SET ` +
                     `                   POSICAO = 'L' ` +
                     `                 , MOTIVOPOSICAO = NULL ` +
                     `                 , CODMOTIVO = NULL ` +
@@ -234,8 +205,7 @@ export class OrderService {
                     `                  AND TV7.POSICAO = 'L' )`;
 
                 await queryRunner.manager.query(sql, [order.numped]);
-        sql =
+                sql = ` UPDATE PCPEDC SET ` +
-          ` UPDATE PCPEDC SET ` +
                     `                   POSICAO =  ( SELECT PCPEDI.POSICAO FROM PCPEDI WHERE PCPEDI.NUMPED = PCPEDC.NUMPED AND ROWNUM = 1 ) ` +
                     `                 , MOTIVOPOSICAO = NULL ` +
                     `                 , CODMOTIVO = NULL ` +
@@ -260,8 +230,7 @@ export class OrderService {
                 await queryRunner.manager.query(sql, [order.numped]);
 
                 // atualizar campos padrão para rotina 4116
-        sql =
+                sql = ` UPDATE PCPEDC SET ` +
-          ` UPDATE PCPEDC SET ` +
                     `                   DTENTREGA = TRUNC(DTENTREGA) ` +
                     `                 , DATA = TRUNC(DATA) ` +
                     `                 , DTPREVENTREGA = TRUNC(DTENTREGA) ` +
@@ -288,8 +257,7 @@ export class OrderService {
                     `WHERE ( PCPEDC.NUMPED = :1 OR PCPEDC.NUMPEDENTFUT = :2 ) `;
                 await queryRunner.manager.query(sql, [order.numped, order.numped]);
 
-        sql =
+                sql = ` UPDATE PCPEDC SET ` +
-          ` UPDATE PCPEDC SET ` +
                     `                   CODCOB    = ( SELECT TV7.CODCOB FROM PCPEDC TV7 WHERE TV7.NUMPED = PCPEDC.NUMPEDENTFUT ) ` +
                     `                 , CODPLPAG  = ( SELECT TV7.CODPLPAG FROM PCPEDC TV7 WHERE TV7.NUMPED = PCPEDC.NUMPEDENTFUT ) ` +
                     `                 , RESERVAESTOQUETV7 = 'N' ` +
@@ -297,8 +265,7 @@ export class OrderService {
                     `WHERE (PCPEDC.NUMPEDENTFUT = :1 ) `;
                 await queryRunner.manager.query(sql, [order.numped]);
 
-        sql =
+                sql = ` UPDATE PCPEDI SET CODSUPERVISOR = ( SELECT PCPEDC.CODSUPERVISOR FROM PCPEDC WHERE PCPEDC.NUMPED = PCPEDI.NUMPED ) ` +
-          ` UPDATE PCPEDI SET CODSUPERVISOR = ( SELECT PCPEDC.CODSUPERVISOR FROM PCPEDC WHERE PCPEDC.NUMPED = PCPEDI.NUMPED ) ` +
                     `                    ,DTENTREGA = ( SELECT PCPEDC.DTENTREGA FROM PCPEDC WHERE PCPEDI.NUMPED = PCPEDC.NUMPED )         ` +
                     `                    ,COMPLEMENTO   = NVL(( SELECT PCPEDITEMP.COMPLEMENTO FROM PCPEDITEMP, PCPEDCTEMP ` +
                     `                                            WHERE PCPEDITEMP.NUMPEDRCA = PCPEDCTEMP.NUMPEDRCA ` +
@@ -316,11 +283,10 @@ export class OrderService {
                 console.log(err);
             }
 
+
             let status = '';
-      const statusOrder = await queryRunner.query(
+            const statusOrder = await queryRunner
-        'SELECT PCPEDC.POSICAO as "status" FROM PCPEDC WHERE NUMPED = :1',
+                .query('SELECT PCPEDC.POSICAO as "status" FROM PCPEDC WHERE NUMPED = :1', [order.numped]);
-        [order.numped],
-      );
             switch (statusOrder[0].status) {
                 case 'L': {
                     status = 'LIBERADO';
@@ -342,6 +308,7 @@ export class OrderService {
                     status = 'CANCELADO';
                     break;
                 }
+
             }
 
             /* Sempre ira retornar status = LIBERADO*/
@@ -349,7 +316,7 @@ export class OrderService {
 
             return {
                 idOrder: order.numped,
-        status: status,
+                status: status
             };
         } catch (err) {
             console.log(err);
@@ -364,8 +331,7 @@ export class OrderService {
     }
 
     async updateStatusItem(queryRunner: QueryRunner, orderId: number) {
-    const sql =
+        const sql = ` SELECT PCPEDI.ROWID as "rid", PCPEDI.NUMPED as "numped", PCPEDI.CODPROD as "codprod", PCPEDI.CODFILIALRETIRA as "codfilialretira", ` +
-      ` SELECT PCPEDI.ROWID as "rid", PCPEDI.NUMPED as "numped", PCPEDI.CODPROD as "codprod", PCPEDI.CODFILIALRETIRA as "codfilialretira", ` +
             `        PCPEDI.QT as "qt", PCPEDI.POSICAO as "posicao", ` +
             `        ( NVL(PCEST.QTESTGER,0) - NVL(PCEST.QTRESERV,0) - NVL(PCEST.QTBLOQUEADA,0) - NVL(PCEST.QTPENDENTE,0) + PCPEDI.QT ) as "qtestoque_disponivel" ` +
             `   FROM PCPEDI, PCPEDC, PCEST, PCPEDC TV7 ` +
@@ -386,23 +352,19 @@ export class OrderService {
     }
 
     async updateStockItem(queryRunner: QueryRunner, item: any) {
-    let sql = '';
+        let sql = "";
-    if (item.posicao === 'B') {
+        if (item.posicao === "B") {
             if (item.qt > item.qtestoque_disponivel) {
-        sql = `UPDATE PCPEDI SET POSICAO = 'P' ` + ` WHERE PCPEDI.ROWID = :1`;
+                sql = `UPDATE PCPEDI SET POSICAO = 'P' ` +
+                    ` WHERE PCPEDI.ROWID = :1`;
                 await queryRunner.manager.query(sql, [item.rid]);
             } else {
-        sql =
+                sql = `UPDATE PCEST SET QTPENDENTE = GREATEST((QTPENDENTE - :1), 0) ` +
-          `UPDATE PCEST SET QTPENDENTE = GREATEST((QTPENDENTE - :1), 0) ` +
                     `                 ,QTRESERV = QTRESERV + :2 ` +
                     `  WHERE PCEST.CODFILIAL = :3 AND PCEST.CODPROD = :4`;
-        await queryRunner.manager.query(sql, [
+                await queryRunner.manager.query(sql, [item.qt, item.qt, item.codfilialretira, item.codprod]);
-          item.qt,
+                sql = `UPDATE PCPEDI SET POSICAO = 'L' ` +
-          item.qt,
+                    ` WHERE PCPEDI.ROWID = :1`;
-          item.codfilialretira,
-          item.codprod,
-        ]);
-        sql = `UPDATE PCPEDI SET POSICAO = 'L' ` + ` WHERE PCPEDI.ROWID = :1`;
                 await queryRunner.manager.query(sql, [item.rid]);
             }
         }
@@ -427,9 +389,9 @@ export class OrderService {
                     codmotivo: null,
                     motivoposicao: null,
                     vlbonific: 0,
-          vendaassistida: 'S',
+                    vendaassistida: 'S'
                 })
-        .where('numped = :numped', { numped: orderDelivery.numped })
+                .where("numped = :numped", { numped: orderDelivery.numped })
                 .execute();
             await queryRunner.commitTransaction();
         } catch (err) {
@@ -452,14 +414,14 @@ export class OrderService {
                 .createQueryBuilder()
                 .delete()
                 .from(Pcpeditemp)
-        .where('"PCPEDITEMP".NUMPEDRCA = :numpedrca', { numpedrca: idPreOrder })
+                .where("\"PCPEDITEMP\".NUMPEDRCA = :numpedrca", { numpedrca: idPreOrder })
                 .execute();
 
             await queryRunner.manager
                 .createQueryBuilder()
                 .delete()
                 .from(Pcpedctemp)
-        .where('"PCPEDCTEMP".NUMPEDRCA = :numpedrca', { numpedrca: idPreOrder })
+                .where("\"PCPEDCTEMP\".NUMPEDRCA = :numpedrca", { numpedrca: idPreOrder })
                 .execute();
             await queryRunner.commitTransaction();
         } catch (err) {
@@ -471,11 +433,8 @@ export class OrderService {
         }
     }
 
-  async createPreOrder(
+    async createPreOrder(cart: Cart, idPreOrder: number, idPreOrderTV7: number = null) {
-    cart: Cart,
+
-    idPreOrder: number,
-    idPreOrderTV7: number = null,
-  ) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -487,52 +446,36 @@ export class OrderService {
             const customer = await this.getCustomer(cart.idCustomer);
             let idSellerPreorder = cart.idSeller;
             //Verifica se existe orçamento para a prevenda (CART)
-      const cartPreOrder = await queryRunner.query(
+            const cartPreOrder = await queryRunner.query('SELECT ESTPREVENDAC.NUMORCA, PCORCAVENDAC.CODUSUR as "idSeller" ' +
-        'SELECT ESTPREVENDAC.NUMORCA, PCORCAVENDAC.CODUSUR as "idSeller" ' +
                 '  FROM ESTPREVENDAC, PCORCAVENDAC ' +
                 ` WHERE ESTPREVENDAC.ID = '${cart.id}' ` +
-          '   AND ESTPREVENDAC.NUMORCA = PCORCAVENDAC.NUMORCA ',
+                '   AND ESTPREVENDAC.NUMORCA = PCORCAVENDAC.NUMORCA ');
-      );
 
             if (cartPreOrder != null && cartPreOrder.length > 0) {
                 idSellerPreorder = cartPreOrder[0].idSeller;
             }
 
-      const supervisor = await queryRunner.manager.query(
+            const supervisor = await queryRunner.manager.query('SELECT PCUSUARI.CODSUPERVISOR FROM PCUSUARI WHERE CODUSUR = :1', [idSellerPreorder]);
-        'SELECT PCUSUARI.CODSUPERVISOR FROM PCUSUARI WHERE CODUSUR = :1',
-        [idSellerPreorder],
-      );
             console.log(supervisor);
 
             //Create pre-customers 
             if (cart.idCustomer === 1 && cart.preCustomerDocument !== null) {
-        const preCustomer = await queryRunner.query(
+                const preCustomer = await queryRunner.query(`SELECT ESTVENDAPRECLIENTE.CPF FROM ESTVENDAPRECLIENTE ` +
-          `SELECT ESTVENDAPRECLIENTE.CPF FROM ESTVENDAPRECLIENTE ` +
+                    ` WHERE IDCART = :1 AND CPF = :2`, [cart.id, cart.preCustomerDocument]);
-            ` WHERE IDCART = :1 AND CPF = :2`,
-          [cart.id, cart.preCustomerDocument],
-        );
                 if (preCustomer === null || preCustomer.length === 0) {
-          const sqlInsert =
+                    const sqlInsert = ` INSERT INTO ESTVENDAPRECLIENTE ( CPF, IDCART, NOME, TELEFONE, DTCADASTRO, CODUSUR, NUMPEDRCA ) ` +
-            ` INSERT INTO ESTVENDAPRECLIENTE ( CPF, IDCART, NOME, TELEFONE, DTCADASTRO, CODUSUR, NUMPEDRCA ) ` +
                         `  VALUES ( REGEXP_REPLACE(:CPF, '[^0-9]', '') , :IDCART, :NOME, :TELEFONE, SYSDATE, :CODUSUR, :NUMPEDRCA ) `;
-          await queryRunner.query(sqlInsert, [
+                    await queryRunner.query(sqlInsert, [cart.preCustomerDocument,
-            cart.preCustomerDocument,
+                    cart.id, cart.preCustomerName, cart.preCustomerPhone, cart.idSeller, idPreOrder]);
-            cart.id,
-            cart.preCustomerName,
-            cart.preCustomerPhone,
-            cart.idSeller,
-            idPreOrder,
-          ]);
                 }
             } else {
                 if (cart.preCustomerDocument !== null) {
-          await queryRunner.query(
+                    await queryRunner.query(`DELETE FROM ESTVENDAPRECLIENTE WHERE IDCART = :1 AND REGEXP_REPLACE(:CPF, '[^0-9]', '')`,
-            `DELETE FROM ESTVENDAPRECLIENTE WHERE IDCART = :1 AND REGEXP_REPLACE(:CPF, '[^0-9]', '')`,
+                        [cart.id, cart.preCustomerDocument]);
-            [cart.id, cart.preCustomerDocument],
-          );
                 }
             }
 
+
             //#region create PCPEDCTEMP
             console.log('Cart: ' + cart);
             const dateNow = new Date();
@@ -558,18 +501,18 @@ export class OrderService {
             preOrder.hora = preOrder.data.getHours();
             preOrder.minuto = preOrder.data.getMinutes();
             preOrder.dtentrega = dateDelivery;
-      (preOrder.codfilial = cart.saleStore),
+            preOrder.codfilial = cart.saleStore,
-        (preOrder.codfilialnf = preOrder.codfilial);
+                preOrder.codfilialnf = preOrder.codfilial;
             preOrder.codusur = idSellerPreorder; // cart.idSeller;
             if (supervisor != null) {
                 preOrder.codsupervisor = supervisor.codsupervisor;
             }
             preOrder.codemitente = cart.userId;
             preOrder.codusur3 = cart.idProfessional;
-      preOrder.tipointegracao = 'W';
+            preOrder.tipointegracao = "W";
-      preOrder.validarnivelvenda = 'N';
+            preOrder.validarnivelvenda = "N";
             preOrder.dtentrega = cart.shippingDate;
-      preOrder.esc_tipoentrega = cart.scheduleDelivery === true ? 'P' : 'N';
+            preOrder.esc_tipoentrega = (cart.scheduleDelivery === true) ? 'P' : 'N';
             // preOrder.vlfrete = cart.shippingValue; --Já esta sendo incluido item para o valor de frete
             preOrder.vldescontocupom = 0;
             preOrder.vldescontofinanceiro = 0;
@@ -577,15 +520,15 @@ export class OrderService {
             preOrder.vlfretenf = 0;
             preOrder.vloutrasdesp = 0;
             preOrder.vltroco = 0;
-      preOrder.origemped = 'W';
+            preOrder.origemped = "W";
             preOrder.integradora = 10;
-      preOrder.importado = 'N';
+            preOrder.importado = "N";
             preOrder.codautorizacaotef = 0;
-      preOrder.esc_ajustarfinanceiro = 'N';
+            preOrder.esc_ajustarfinanceiro = "N";
-      preOrder.esc_obternsu = 'N';
+            preOrder.esc_obternsu = "N";
             preOrder.esc_vloutrasdespweb = 0;
-      preOrder.pedidopagoecommerce = 'S';
+            preOrder.pedidopagoecommerce = "S";
-      preOrder.numpedmktplace = '';
+            preOrder.numpedmktplace = "";
             preOrder.numitens = cart.itens.length;
             preOrder.obs1 = cart.notation1;
             preOrder.obs2 = cart.notation2;
@@ -595,10 +538,7 @@ export class OrderService {
 
             //Dados do cliente
             preOrder.codcli = cart.idCustomer;
-      preOrder.codpraca =
+            preOrder.codpraca = (cart.shippingPriority == "M" && cart.idStorePlace != null ) ? cart.idStorePlace : customer.codpraca;
-        cart.shippingPriority == 'M' && cart.idStorePlace != null
-          ? cart.idStorePlace
-          : customer.codpraca;
             preOrder.fretedespacho = customer.fretedespacho;
             preOrder.codfornecfrete = cart.carrierId;
 
@@ -612,8 +552,8 @@ export class OrderService {
 
             let numeroSeq = 1;
             for (const item of cart.itens) {
-        const kit = await queryRunner.query(
+
-          'SELECT PCFORMPROD.CODPRODMP as "idProduct", ' +
+                const kit = await queryRunner.query('SELECT PCFORMPROD.CODPRODMP as "idProduct", ' +
                     '       PCFORMPROD.QTPRODMP as "qtComponent", ' +
                     '       PCPRODUT.CODAUXILIAR as "ean"       ,' +
                     `       case when ESTLISTAPRODUTOS.PRECOPROMOCIONAL > 0 AND '${cart.idBilling}' <> 'CHM' THEN ` +
@@ -624,19 +564,17 @@ export class OrderService {
                     '   AND PCFORMPROD.CODPRODMP = PCPRODUT.CODPROD ' +
                     '   AND PCPRODUT.CODPROD = ESTLISTAPRODUTOS.CODPROD ' +
                     '   AND ESTLISTAPRODUTOS.CODFILIAL = :2',
-          [item.idProduct, preOrder.codfilial],
+                    [item.idProduct, preOrder.codfilial]);
-        );
                 if (kit.length > 0) {
                     for (const componente of kit) {
+
                         const listPrice = componente.listPrice;
 
-            const salePrice = (
+                        const salePrice = (componente.listPrice *
-              componente.listPrice *
+                            (item.salePrice / item.listPrice)).toFixed(2);
-              (item.salePrice / item.listPrice)
-            ).toFixed(2);
 
                         const itemOrder = new Pcpeditemp();
-            itemOrder.tipointegracao = 'W';
+                        itemOrder.tipointegracao = "W";
                         itemOrder.integradora = 10;
                         itemOrder.numpedrca = idPreOrder;
                         itemOrder.numpedweb = idPreOrder;
@@ -646,15 +584,14 @@ export class OrderService {
                         itemOrder.codprod = componente.idProduct;
                         itemOrder.codauxiliar = componente.ean;
                         itemOrder.codfilialretira = item.idStock;
-            itemOrder.tipoentrega =
+                        itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-              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') {
                             preOrder.dtentrega = new Date();
                         }
                         itemOrder.ptabela = Number.parseFloat(listPrice);
                         itemOrder.pvenda = Number.parseFloat(salePrice);
-            itemOrder.qt = item.quantity * componente.qtComponent;
+                        itemOrder.qt = (item.quantity * componente.qtComponent);
                         itemOrder.data = new Date();
                         itemOrder.complemento = item.descriptionAux;
                         itemOrder.localizacao = item.environment;
@@ -667,10 +604,10 @@ export class OrderService {
                             .execute();
 
                         numeroSeq = numeroSeq + 1;
-          }
+                    };
                 } else {
                     const itemOrder = new Pcpeditemp();
-          itemOrder.tipointegracao = 'W';
+                    itemOrder.tipointegracao = "W";
                     itemOrder.integradora = 10;
                     itemOrder.numpedrca = idPreOrder;
                     itemOrder.numpedweb = idPreOrder;
@@ -680,9 +617,8 @@ export class OrderService {
                     itemOrder.codprod = item.idProduct;
                     itemOrder.codauxiliar = item.ean;
                     itemOrder.codfilialretira = item.idStock;
-          itemOrder.tipoentrega =
+                    itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
-            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') {
                         preOrder.dtentrega = new Date();
                     }
@@ -701,6 +637,7 @@ export class OrderService {
                         .execute();
 
                     numeroSeq = numeroSeq + 1;
+
                 }
             }
 
@@ -708,7 +645,7 @@ export class OrderService {
 
             if (cart.shippingValue > 0) {
                 const itemOrder = new Pcpeditemp();
-        itemOrder.tipointegracao = 'W';
+                itemOrder.tipointegracao = "W";
                 itemOrder.integradora = 10;
                 itemOrder.numpedrca = idPreOrder;
                 itemOrder.numpedweb = idPreOrder;
@@ -724,6 +661,7 @@ export class OrderService {
                 itemOrder.qt = 1;
                 itemOrder.data = new Date();
 
+
                 await queryRunner.manager
                     .createQueryBuilder()
                     .insert()
@@ -744,6 +682,7 @@ export class OrderService {
 
             await queryRunner.commitTransaction();
             return preOrder;
+
         } catch (err) {
             await queryRunner.rollbackTransaction();
             throw err;
@@ -751,6 +690,8 @@ export class OrderService {
             await queryRunner.release();
             await connection.close();
         }
+        
+
     }
 
     async findSale(id: string) {
@@ -762,7 +703,7 @@ export class OrderService {
             const sale = await queryRunner.manager
                 .getRepository(Sale)
                 .createQueryBuilder('estvenda')
-        .where('"estvenda".id = :id', { id: id })
+                .where("\"estvenda\".id = :id", { id: id })
                 .getOne();
             return sale;
         } catch (error) {
@@ -783,7 +724,7 @@ export class OrderService {
             const shopping = await queryRunner.manager
                 .getRepository(ShoppingItens)
                 .createQueryBuilder('estshopping')
-        .where('"estshopping".id = :id', { id: idshopping })
+                .where("\"estshopping\".id = :id", { id: idshopping })
                 .getMany();
             return shopping;
         } catch (error) {
@@ -801,8 +742,7 @@ export class OrderService {
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         console.log('Consultando usuario ' + idSeller);
-    let sql =
+        let sql = 'SELECT NVL(PROXNUMPEDWEB,0) as "proxnumpedweb" FROM PCUSUARI ' +
-      'SELECT NVL(PROXNUMPEDWEB,0) as "proxnumpedweb" FROM PCUSUARI ' +
             ' WHERE PCUSUARI.CODUSUR = :1 FOR UPDATE';
         const seller = await queryRunner.query(sql, [idSeller]);
        
@@ -812,21 +752,27 @@ export class OrderService {
         await queryRunner.startTransaction();
 
         try {
-      sql =
+
-        'UPDATE PCUSUARI SET PROXNUMPEDWEB = NVL(PROXNUMPEDWEB,0) + 1 ' +
+            sql = 'UPDATE PCUSUARI SET PROXNUMPEDWEB = NVL(PROXNUMPEDWEB,0) + 1 ' +
                 '   WHERE PCUSUARI.CODUSUR = :1';
             await queryRunner.query(sql, [idSeller]);
 
+           
             await queryRunner.commitTransaction();
             return idOrder;
+
         } catch (err) {
+
             await queryRunner.rollbackTransaction();
             console.log(err);
             return -1;
+
         } finally {
+
             await queryRunner.release();
             await connection.close();
         }
+
     }
 
     async getCustomer(idCustomer: number) {
@@ -838,7 +784,7 @@ export class OrderService {
             const customer = await queryRunner.manager
                 .getRepository(Pcclient)
                 .createQueryBuilder('pcclient')
-        .where('"pcclient".codcli = :idCustomer', { idCustomer })
+                .where("\"pcclient\".codcli = :idCustomer", { idCustomer })
                 .getOne();
             return customer;
         } catch (error) {
@@ -850,15 +796,8 @@ export class OrderService {
         }
     }
 
-  async getOrders(
+    async getOrders(store: string, initialDate: Date, finalDate: Date,
-    store: string,
+        document: string, name: string, sellerId: number, idOrder: string) {
-    initialDate: Date,
-    finalDate: Date,
-    document: string,
-    name: string,
-    sellerId: number,
-    idOrder: string,
-  ) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -867,8 +806,8 @@ export class OrderService {
         let sql = '';
 
         try {
-      sql =
+
-        ` SELECT TO_CHAR(PCPEDC.DATA, \'DD/MM/YYYY\') as "createDate"  ` +
+            sql = ` SELECT TO_CHAR(PCPEDC.DATA, \'DD/MM/YYYY\') as "createDate"  ` +
                 `       ,PCPEDC.NUMPED as "orderId"  ` +
                 `       ,PCPEDC.CODFILIAL as "store"  ` +
                 `       ,CASE WHEN PCPEDC.POSICAO = 'B' THEN 'BLOQUEADO' ` +
@@ -894,10 +833,7 @@ export class OrderService {
                 sqlWhere += `   AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
             }
             if (name != null && name != '') {
-        sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace(
+                sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
-          '@',
-          '%',
-        )}'||'%'`;
             }
             if (sellerId > 0) {
                 sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId}  `;
@@ -909,14 +845,14 @@ export class OrderService {
             //tratamento de data//
             const startDate = new Date(initialDate);
             let day = startDate.getDate();
-      let month = ('00' + (startDate.getMonth() + 1)).slice(-2);
+            let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
             let year = startDate.getFullYear();
-      const startFormat = day + '/' + month + '/' + year;
+            const startFormat = day + "/" + month + "/" + year;
             const endDate = new Date(finalDate);
             day = endDate.getDate();
-      month = ('00' + (endDate.getMonth() + 1)).slice(-2);
+            month = ("00" + (endDate.getMonth() + 1)).slice(-2);
             year = endDate.getFullYear();
-      const endFormat = day + '/' + month + '/' + year;
+            const endFormat = day + "/" + month + "/" + year;
 
             sqlWhere += ` AND PCPEDC.DATA BETWEEN TO_DATE('${startFormat}', 'DD/MM/YYYY') AND TO_DATE('${endFormat}', 'DD/MM/YYYY')  `;
 
@@ -929,8 +865,10 @@ export class OrderService {
             await queryRunner.release();
             await connection.close();
         }
+
     }
       
+
     async getItensOrder(idOrder: number) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
@@ -939,8 +877,8 @@ export class OrderService {
         let sql = '';
 
         try {
-      sql =
+
-        ` SELECT PCPEDI.CODPROD as "productId", PCPRODUT.DESCRICAO as "description", ` +
+            sql = ` SELECT PCPEDI.CODPROD as "productId", PCPRODUT.DESCRICAO as "description", ` +
                 `        PCPRODUT.EMBALAGEM as "package",                                    ` +
                 `        ( SELECT PCPEDITEMP.COMPLEMENTO  FROM PCPEDITEMP                    ` +
                 `            WHERE PCPEDC.NUMPEDRCA = PCPEDITEMP.NUMPEDRCA                   ` +
@@ -967,6 +905,7 @@ export class OrderService {
             await queryRunner.release();
             await connection.close();
         }
+
     }
 
     async getCartId(orderId: number) {
@@ -975,8 +914,7 @@ export class OrderService {
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-      const order = await queryRunner.query(
+            const order = await queryRunner.query('SELECT PCPEDC.DATA as "createDate" ' +
-        'SELECT PCPEDC.DATA as "createDate" ' +
                 '      ,PCPEDC.NUMPED             as "orderId" ' +
                 '      ,PCPEDC.CODFILIAL          as "invoiceStore" ' +
                 '      ,PCPEDC.CODCLI             as "customerId" ' +
@@ -986,6 +924,7 @@ export class OrderService {
                 '      ,PCPEDC.CODUSUR3           as "partnerId" ' +
                 '      ,ESTPREVENDAC.ID           as "cartId" ' +
                 '      ,PCPEDC.POSICAO            as "status" ' +
+
                 '      ,PCPEDC.OBS                as "notification" ' +
                 '      ,PCPEDC.OBS1               as "notification1" ' +
                 '      ,PCPEDC.OBS2               as "notification2" ' +
@@ -997,64 +936,35 @@ export class OrderService {
                 `      ,NVL(PCPEDC.TIPOPRIORIDADEENTREGA, 'B')  as "priorityDelivery" ` +
                 '  FROM PCPEDC, ESTPREVENDAC ' +
                 ' WHERE PCPEDC.NUMPED = ESTPREVENDAC.NUMPED ' +
-          '   AND PCPEDC.NUMPED = :1',
+                '   AND PCPEDC.NUMPED = :1', [orderId]);
-        [orderId],
-      );
 
             if (order.length == 0) {
-        throw new HttpException(
+                throw new HttpException(`Pedido não foi localizado`, HttpStatus.NOT_FOUND);
-          `Pedido não foi localizado`,
-          HttpStatus.NOT_FOUND,
-        );
             }
 
             if (order.status == 'F') {
-        throw new HttpException(
+                throw new HttpException(`Pedido já FATURADO, alteração não permitida.`, HttpStatus.NOT_FOUND);
-          `Pedido já FATURADO, alteração não permitida.`,
-          HttpStatus.NOT_FOUND,
-        );
             }
 
             const invoiceStores = await this.listsService.GetStoreAll();
-      const invoiceStore = await invoiceStores.find(
+            const invoiceStore = await invoiceStores.find(data => data.id === order[0].invoiceStore);
-        data => data.id === order[0].invoiceStore,
+            const customer = await this.customerService.findCustomerById(order[0].customerId);
-      );
-      const customer = await this.customerService.findCustomerById(
-        order[0].customerId,
-      );
             const billinds = await this.listsService.GetBilling(order[0].customerId);
             const partners = await this.listsService.GetPartners();
-      const address = await this.addressCustomerService.getAddress(
+            const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId);
-        order[0].customerId,
-        order[0].addressId,
-      );
             const billing = billinds.find(data => data.codcob === order[0].billindId);
-      const paymentPlans = await this.listsService.GetPaymentPlan(
+            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob);
-        billing.codcob,
+            const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId);
-      );
-      const paymentPlan = paymentPlans.find(
-        data => data.codplpag === order[0].paymentPlanId,
-      );
             const partner = partners.find(data => data.id === order[0].partnerId);
 
             return {
-        cartId: order[0].cartId,
+                cartId: order[0].cartId, invoiceStore: invoiceStore, customer: customer, partner: partner,
-        invoiceStore: invoiceStore,
+                paymentPlan: paymentPlan, billing: billing, address: address,
-        customer: customer,
+                notification: order[0].notification, notification1: order[0].notification1, notification2: order[0].notification2,
-        partner: partner,
+                notificationDelivery1: order[0].notificationDelivery1, notificationDelivery2: order[0].notificationDelivery2, notificationDelivery3: order[0].notificationDelivery3,
-        paymentPlan: paymentPlan,
+                deliveryDate: order[0].deliveryDate, squeduleDelivery: order[0].esc_tipoEntrega == 'P' ? true : false, priorityDelivery: order[0].priorityDelivery
-        billing: billing,
+            }
-        address: address,
+
-        notification: order[0].notification,
-        notification1: order[0].notification1,
-        notification2: order[0].notification2,
-        notificationDelivery1: order[0].notificationDelivery1,
-        notificationDelivery2: order[0].notificationDelivery2,
-        notificationDelivery3: order[0].notificationDelivery3,
-        deliveryDate: order[0].deliveryDate,
-        squeduleDelivery: order[0].esc_tipoEntrega == 'P' ? true : false,
-        priorityDelivery: order[0].priorityDelivery,
-      };
         } finally {
             await queryRunner.release();
             await connection.close();
@@ -1062,31 +972,25 @@ export class OrderService {
     }
 
     async createPreCustomer(cart: Cart) {
+
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         await queryRunner.startTransaction();
         try {
-      const preCustomer = await queryRunner.query(
+            const preCustomer = await queryRunner.query(`SELECT ESTVENDAPRECLIENTE.CPF FROM ESTVENDAPRECLIENTE ` +
-        `SELECT ESTVENDAPRECLIENTE.CPF FROM ESTVENDAPRECLIENTE ` +
+                ` WHERE IDCART = :1 AND CPF = :2`, [cart.id, cart.preCustomerDocument]);
-          ` WHERE IDCART = :1 AND CPF = :2`,
-        [cart.id, cart.preCustomerDocument],
-      );
             if (preCustomer.length === 0) {
-        const sqlInsert =
+                const sqlInsert = ` INSERT INTO ESTVENDAPRECLIENTE ( CPF, IDCART, NOME, TELEFONE, DTCADASTRO, CODUSUR ) ` +
-          ` INSERT INTO ESTVENDAPRECLIENTE ( CPF, IDCART, NOME, TELEFONE, DTCADASTRO, CODUSUR ) ` +
                     `  VALUES ( REGEXP_REPLACE(:CPF, '[^0-9]', '') , :IDCART, :NOME, :TELEFONE, SYSDATE, :CODUSUR ) `;
-        await queryRunner.query(sqlInsert, [
+                await queryRunner.query(sqlInsert, [cart.preCustomerDocument,
-          cart.preCustomerDocument,
+                cart.id, cart.preCustomerName, cart.preCustomerPhone, cart.idSeller]);
-          cart.id,
-          cart.preCustomerName,
-          cart.preCustomerPhone,
-          cart.idSeller,
-        ]);
             } else {
+
             }
             await queryRunner.commitTransaction();
+
         } catch (err) {
             await queryRunner.rollbackTransaction();
             console.log(err);
@@ -1097,8 +1001,7 @@ export class OrderService {
     }
 
     async productsWithoutTax(idCart: string, idCustomer: number) {
-    const sql =
+        const sql = '     SELECT ESTPREVENDAI.CODPROD as "productId", PCPRODUT.DESCRICAO as "description", ' +
-      '     SELECT ESTPREVENDAI.CODPROD as "productId", PCPRODUT.DESCRICAO as "description", ' +
             '        PCPRODUT.EMBALAGEM as "package", PCCLIENT.ESTENT as "uf"                  ' +
             '   FROM ESTPREVENDAI, ESTPREVENDAC, PCCLIENT, PCPRODUT                 ' +
             '  WHERE ESTPREVENDAI.IDCART  = ESTPREVENDAC.ID                         ' +
@@ -1125,8 +1028,8 @@ export class OrderService {
     }
 
     async OrderRetiraPosterior() {
-    const sql =
+
-      ' SELECT                                                ' +
+        const sql = ' SELECT                                                ' +
             '   p.DATA                      as "data"               ' +
             '  ,p.numped                    as "orderId"            ' +
             `  ,TO_CHAR(p.datapedido, 'DD/MM/YYYY HH24:MI')     as "orderDate"          ` +
@@ -1140,7 +1043,6 @@ export class OrderService {
             '  ,round( trunc(sysdate-p.DATAPEDIDO) * 24 + (sysdate-p.DATAPEDIDO - trunc(sysdate-p.DATAPEDIDO)) * 24) as "timeHour"  ' +
             '  ,round(( ( trunc(sysdate-p.DATAPEDIDO) * 24 + (sysdate-p.DATAPEDIDO - trunc(sysdate-p.DATAPEDIDO)) * 24) -           ' +
             '      TRUNC(( trunc(sysdate-p.DATAPEDIDO) * 24 + (sysdate-p.DATAPEDIDO - trunc(sysdate-p.DATAPEDIDO)) * 24)) ) * 60,0) as "timeMinute"   ' +
-      '  ,p.codfilial          as "storeId"            ' +
             '   FROM esvpedidoretiraposterior p                     ' +
             '   ORDER BY p.datapedido   ';
 
@@ -1155,19 +1057,15 @@ export class OrderService {
             await queryRunner.release();
             await connection.close();
         }
+
+
     }
 
-  async getProductsOrder(
+    async getProductsOrder(store: string, initialDate: Date, finalDate: Date,
-    store: string,
+        document: string, name: string, sellerId: number, idOrder: string,
-    initialDate: Date,
+        typeFilterProduct: string, productText: string
-    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"
                             ,PCPEDC.NUMNOTA       as "invoice"
@@ -1211,10 +1109,7 @@ export class OrderService {
                 sqlWhere += `   AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
             }
             if (name != null && name != '') {
-      sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace(
+                sqlWhere += `   AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
-        '@',
-        '%',
-      )}'||'%'`;
             }
             if (sellerId > 0) {
                 sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId}  `;
@@ -1237,25 +1132,25 @@ export class OrderService {
                     case 'PARTNER': 
                         sqlWhere += ` AND PCPRODUT.CODFAB like '${productText}%'`;
                         break;
-        default:
+                    default: break;
-          break;
                 }
             }
 
             //tratamento de data//
             const startDate = new Date(initialDate);
             let day = startDate.getDate();
-    let month = ('00' + (startDate.getMonth() + 1)).slice(-2);
+            let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
             let year = startDate.getFullYear();
-    const startFormat = day + '/' + month + '/' + year;
+            const startFormat = day + "/" + month + "/" + year;
             const endDate = new Date(finalDate);
             day = endDate.getDate();
-    month = ('00' + (endDate.getMonth() + 1)).slice(-2);
+            month = ("00" + (endDate.getMonth() + 1)).slice(-2);
             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')  `;
                 
+
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
@@ -1268,4 +1163,5 @@ export class OrderService {
             await connection.close();
         }
     }
+
 }

src/sales/sales/sales.service.ts

@@ -1,18 +1,19 @@
-import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
+import { Injectable, HttpException, HttpStatus, Inject, CACHE_MANAGER } from '@nestjs/common';
-import { Connection } from 'typeorm';
-import { connectionOptions } from '../../configs/typeorm.config';
-import { Estavisoestoque } from '../../domain/entity/tables/estavisoestoque.entity';
-import { Estruptura } from '../../domain/entity/tables/estruptura.entity';
 import { Pcclient } from '../../domain/entity/tables/pcclient.entity';
-import { Esvanalisevendarca } from '../../domain/entity/views/esvanalisevendarca.entity';
-import { Esvdepartamento } from '../../domain/entity/views/esvdepartamento.entity';
-import { Esvparcelamentovenda } from '../../domain/entity/views/esvparcelamentovenda.entity';
 import { SalesProduct } from '../../domain/entity/views/esvprodutosvenda.entity';
-import { Esvsecao } from '../../domain/entity/views/esvsecao.entity';
+import { Connection, getConnection } from 'typeorm';
 import { Esvsituacaopedido } from '../../domain/entity/views/esvsituacaopedido.entity';
+import { Stock } from '../../domain/entity/views/esvestoquevenda.entity';
 import { FilterProduct } from '../../domain/models/filter-product.model';
 import { Notify } from '../../domain/models/notify.model';
+import { Estavisoestoque } from '../../domain/entity/tables/estavisoestoque.entity';
+import { Esvparcelamentovenda } from '../../domain/entity/views/esvparcelamentovenda.entity';
 import { Rupture } from '../../domain/models/rupture.model';
+import { Estruptura } from '../../domain/entity/tables/estruptura.entity';
+import { Esvsecao } from '../../domain/entity/views/esvsecao.entity';
+import { Esvdepartamento } from '../../domain/entity/views/esvdepartamento.entity';
+import { Esvanalisevendarca } from '../../domain/entity/views/esvanalisevendarca.entity';
+import { connectionOptions } from '../../configs/typeorm.config';
 import { CustomerService } from '../customer/customer.service';
 import Redis = require('ioredis');
 
@@ -953,12 +954,9 @@ export class SalesService {
                                               WHERE PCFILIALRETIRA.CODFILIALVENDA = '${storeId}'
                                                 AND PCFILIALRETIRA.CODFILIALRETIRA = ESVESTOQUEVENDA.CODFILIAL ) > 0 THEN 1 
                                     ELSE 0 END )                            as "allowDelivery"  
-                                , NVL(PCEST.QTEXPOSICAO,0) as "exhibition"
+                                FROM ESVESTOQUEVENDA, PCFILIAL
-                                FROM ESVESTOQUEVENDA, PCFILIAL, PCEST
                             WHERE ESVESTOQUEVENDA.CODPROD = ${id}
                               AND ESVESTOQUEVENDA.CODFILIAL = PCFILIAL.CODIGO
-                              AND ESVESTOQUEVENDA.CODFILIAL = PCEST.CODFILIAL
-                              AND ESVESTOQUEVENDA.CODPROD = PCEST.CODPROD
                             ORDER BY TO_NUMBER(ESVESTOQUEVENDA.CODFILIAL) `;
             
             const stock = await queryRunner.query(sql); 
@@ -1470,7 +1468,6 @@ export class SalesService {
                 .query(sql, [cityId, cartId]);
             return deliveryTaxTable;
         } catch (err) {
-            console.log(err);
             throw err;
         } finally {
             await queryRunner.release();
@@ -1505,20 +1502,8 @@ export class SalesService {
     }
 
     async calculateDeliveryTaxOrder(dataDeliveryTax: any) {
-        console.log("json dataDeliveryTax", dataDeliveryTax);
+        let cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode);
-        /*const dataDeliveryTax = {
-              cartId: cartId,
-              cityId: cityId,
-              ibgeCode: ibgeCode,
-              priorityDelivery: priorityDelivery,
-            };*/
         
-        let cityId = 0;
-        if (dataDeliveryTax.ibgeCode) {
-            cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode);
-        } else {
-            cityId = dataDeliveryTax.cityId;
-        }
         await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery);
 
         if (cityId == 0) {

src/sales/shopping/shopping.controller.ts

@@ -6,8 +6,6 @@ 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';
-import { CartUpdate } from 'src/domain/models/cart-update.model';
 
 @ApiTags('Shopping')
 @Controller('api/v1/shopping')
@@ -84,19 +82,6 @@ export class ShoppingController {
         }
     }
 
-    @Put('cart')
-    async updateCart(@Body() cart: CartUpdate) {
-        try {
-            if (cart.id == null) {
-                throw new HttpException('Cart sem Id informado, faça a inclusão do item no carrinho.', HttpStatus.BAD_REQUEST);
-            }
-            const updateCart = await this.shoppingService.updateShopping(cart);
-            return updateCart;
-        } catch (error) {
-            throw new HttpException(error.message, HttpStatus.BAD_REQUEST);
-        }
-    }
-
     @Post('log')
     async logOrderShopping(@Body() logOrder: LogOrder){
         try { 

src/sales/shopping/shopping.service.ts

@@ -8,8 +8,6 @@ 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';
-import { CartUpdate } from 'src/domain/models/cart-update.model';
 
 @Injectable()
 export class ShoppingService {
@@ -301,58 +299,6 @@ export class ShoppingService {
 
     }
 
-    async updateShopping(cart: CartUpdate) {
-        const connectionDb = new Connection(connectionOptions);
-        await connectionDb.connect();
-        const queryRunner = connectionDb.createQueryRunner();
-        await queryRunner.connect();
-        await queryRunner.startTransaction();
-
-        try {
-            const sqlUpdate = `UPDATE ESTPREVENDAC SET
-                                    CODFILIAL = :1,
-                                    CODUSUR = :2,
-                                    CODCLI = :3,
-                                    CODENDENTCLI = :4,
-                                    VLPEDIDO = :5,
-                                    VLDESCONTO = :6,
-                                    VLTAXAENTREGA = :7,
-                                    TIPOPRIORIDADEENTREGA = :8
-                                WHERE ID = :9
-            `;
-
-            const total = await queryRunner.query('SELECT SUM(ESTPREVENDAI.PTABELA * ESTPREVENDAI.QT) as "vltabela" ' +
-                '      ,SUM(ESTPREVENDAI.PVENDA  * ESTPREVENDAI.QT) as "vlatend" ' +
-                '      ,SUM(ESTPREVENDAI.VLDESCONTO * ESTPREVENDAI.QT) as "vldesconto" ' +
-                '      ,SUM(PCPRODUT.PESOBRUTO * ESTPREVENDAI.QT) as "totpeso" ' +
-                '  FROM ESTPREVENDAI, PCPRODUT ' +
-                ' WHERE ESTPREVENDAI.CODPROD = PCPRODUT.CODPROD ' +
-                '   AND ESTPREVENDAI.IDCART = :1', [cart.id]);
-
-            await queryRunner.query(sqlUpdate, [
-                cart.saleStore,
-                cart.userId,
-                cart.idCustomer,
-                cart.idAddress,
-                total[0].vlatend,
-                total[0].vldesconto,
-                cart.shippingValue,
-                cart.shippingPriority,
-                cart.id
-            ]);
-
-            await queryRunner.commitTransaction();
-
-            return cart;
-        } catch (error) {
-            await queryRunner.rollbackTransaction();
-            throw error;
-        } finally {
-            await queryRunner.release();
-            await connectionDb.close();
-        }
-    }
-
     async updateTotalShopping(idCart: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();

tsconfig.json

@@ -13,9 +13,7 @@
     "paths": {
       "src/*": ["./src/*"]
     },
-    "incremental": true,
+    "incremental": true
-    "skipLibCheck": true,
-    "strict": false
   },
   "exclude": ["node_modules", "dist"]
 }