simplifique/Vendaweb-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: persist shipping fee and refresh k8s docs
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m14s
Details

Browse Source
This commit is contained in:
Joelbrit0
2026-01-29 19:54:41 -03:00
parent 16882046cf
commit e5dc346b96
5 changed files with 248 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/sales/order/order.service.ts
View File

@@ -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';
@@ -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;
@@ -586,7 +587,7 @@ export class OrderService {
itemOrder.codfilialretira = item.idStock;
itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
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);
@@ -619,7 +620,7 @@ export class OrderService {
itemOrder.codfilialretira = item.idStock;
itemOrder.tipoentrega = (item.deliveryMethod == 'RA') ? "RP" : item.deliveryMethod;
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) {
const itemOrder = new Pcpeditemp();
itemOrder.tipointegracao = "W";
itemOrder.integradora = 10;
itemOrder.numpedrca = idPreOrder;
itemOrder.numpedweb = idPreOrder;
itemOrder.codcli = cart.idCustomer;
itemOrder.codusur = idSellerPreorder; //cart.idSeller;
itemOrder.numseq = numeroSeq;
itemOrder.codprod = 48500;
itemOrder.codauxiliar = 48500;
itemOrder.codfilialretira = '12';
itemOrder.tipoentrega = 'EF';
itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
itemOrder.qt = 1;
itemOrder.data = new Date();
// if (cart.shippingValue > 0) {
// const itemOrder = new Pcpeditemp();
// itemOrder.tipointegracao = "W";
// itemOrder.integradora = 10;
// itemOrder.numpedrca = idPreOrder;
// itemOrder.numpedweb = idPreOrder;
// itemOrder.codcli = cart.idCustomer;
// itemOrder.codusur = idSellerPreorder; //cart.idSeller;
// itemOrder.numseq = numeroSeq;
// itemOrder.codprod = 48500;
// itemOrder.codauxiliar = 48500;
// itemOrder.codfilialretira = '12';
// itemOrder.tipoentrega = 'EF';
// itemOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
// itemOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
// itemOrder.qt = 1;
// itemOrder.data = new Date();
await queryRunner.manager
.createQueryBuilder()
.insert()
.into(Pcpeditemp)
.values(itemOrder)
.execute();
// await queryRunner.manager
// .createQueryBuilder()
// .insert()
// .into(Pcpeditemp)
// .values(itemOrder)
// .execute();
numeroSeq = numeroSeq + 1;
}
// numeroSeq = numeroSeq + 1;
// }
// execute some operations on this transaction:
await queryRunner.manager
@@ -690,7 +691,7 @@ export class OrderService {
await queryRunner.release();
await connection.close();
}
}
@@ -745,7 +746,7 @@ export class OrderService {
let sql = 'SELECT NVL(PROXNUMPEDWEB,0) as "proxnumpedweb" FROM PCUSUARI ' +
' WHERE PCUSUARI.CODUSUR = :1 FOR UPDATE';
const seller = await queryRunner.query(sql, [idSeller]);
const idOrder = seller[0].proxnumpedweb;
console.log(idOrder);
@@ -757,7 +758,7 @@ export class OrderService {
' WHERE PCUSUARI.CODUSUR = :1';
await queryRunner.query(sql, [idSeller]);
await queryRunner.commitTransaction();
return idOrder;
@@ -820,7 +821,7 @@ export class OrderService {
` ,PCCLIENT.CLIENTE as "customerName" ` +
` ,PCPEDC.VLATEND as "orderValue" ` +
` ,PCPEDC.NUMITENS as "itens" ` +
` ,CASE WHEN ( SELECT COUNT(1) FROM ESTPIX WHERE ESTPIX.NUMPED = PCPEDC.NUMPED ) > 0 THEN 'S' ELSE 'N' END as "pixCreate" ` +
` ,CASE WHEN ( SELECT COUNT(1) FROM ESTPIX WHERE ESTPIX.NUMPED = PCPEDC.NUMPED ) > 0 THEN 'S' ELSE 'N' END as "pixCreate" ` +
` FROM PCPEDC, PCCLIENT ` +
` WHERE PCPEDC.CODCLI = PCCLIENT.CODCLI ` +
` AND PCPEDC.CONDVENDA IN (1,7) ` +
@@ -867,7 +868,7 @@ export class OrderService {
}
}
async getItensOrder(idOrder: number) {
const connection = new Connection(connectionOptions);
@@ -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,53 +1104,53 @@ export class OrderService {
let sqlWhere = '';
if (store != null && store != '' && store != '99') {
sqlWhere += ` AND PCPEDC.CODFILIAL = '${store}' `;
}
if (document != null && document != '') {
sqlWhere += ` AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
}
if (name != null && name != '') {
sqlWhere += ` AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
}
if (sellerId > 0) {
sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId} `;
}
if (idOrder.trim() != null && idOrder.trim() != '') {
sqlWhere += ` AND PCPEDC.NUMPED = ${idOrder} `;
}
sqlWhere += ` AND PCPEDC.CODFILIAL = '${store}' `;
}
if (document != null && document != '') {
sqlWhere += ` AND REGEXP_REPLACE(PCCLIENT.CGCENT, '[^0-9]', '') = REGEXP_REPLACE('${document}', '[^0-9]', '')`;
}
if (name != null && name != '') {
sqlWhere += ` AND PCCLIENT.CLIENTE LIKE '${name.replace('@', '%')}'||'%'`;
}
if (sellerId > 0) {
sqlWhere += ` AND PCPEDC.CODUSUR = ${sellerId} `;
}
if (idOrder.trim() != null && idOrder.trim() != '') {
sqlWhere += ` AND PCPEDC.NUMPED = ${idOrder} `;
}
if ( typeFilterProduct != '') {
switch (typeFilterProduct) {
case 'ID':
sqlWhere += ` AND PCPEDI.CODPROD = ${productText} `;
break;
case 'EAN':
sqlWhere += ` AND PCPRODUT.CODAUXILIAR = ${productText} `;
break;
case 'TEXT':
sqlWhere += ` AND PCPRODUT.DESCRICAO LIKE '${productText}%' `;
break;
case 'PARTNER':
sqlWhere += ` AND PCPRODUT.CODFAB like '${productText}%'`;
break;
default: break;
}
if (typeFilterProduct != '') {
switch (typeFilterProduct) {
case 'ID':
sqlWhere += ` AND PCPEDI.CODPROD = ${productText} `;
break;
case 'EAN':
sqlWhere += ` AND PCPRODUT.CODAUXILIAR = ${productText} `;
break;
case 'TEXT':
sqlWhere += ` AND PCPRODUT.DESCRICAO LIKE '${productText}%' `;
break;
case 'PARTNER':
sqlWhere += ` AND PCPRODUT.CODFAB like '${productText}%'`;
break;
default: break;
}
}
//tratamento de data//
const startDate = new Date(initialDate);
let day = startDate.getDate();
let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
let year = startDate.getFullYear();
const startFormat = day + "/" + month + "/" + year;
const endDate = new Date(finalDate);
day = endDate.getDate();
month = ("00" + (endDate.getMonth() + 1)).slice(-2);
year = endDate.getFullYear();
const endFormat = day + "/" + month + "/" + year;
//tratamento de data//
const startDate = new Date(initialDate);
let day = startDate.getDate();
let month = ("00" + (startDate.getMonth() + 1)).slice(-2);
let year = startDate.getFullYear();
const startFormat = day + "/" + month + "/" + year;
const endDate = new Date(finalDate);
day = endDate.getDate();
month = ("00" + (endDate.getMonth() + 1)).slice(-2);
year = endDate.getFullYear();
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);
await connection.connect();