12 Commits

Author SHA1 Message Date
Gitea Action
18e822e949 chore: update image tag to f1c0543 [skip ci] 2026-02-24 23:29:45 +00:00
joelson
f1c0543a0b feat: add prod hpa configuration
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m9s
2026-02-24 20:27:05 -03:00
Gitea Action
f67d73d1b8 chore: update image tag to 5a2ea15 [skip ci] 2026-02-20 13:12:41 +00:00
Luis Eduardo Estevao
5a2ea15914 Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m11s
2026-02-20 10:06:11 -03:00
Luis Eduardo Estevao
3d4265854f feat: add new service for pre-order creation with transaction management and item processing. 2026-02-20 10:06:06 -03:00
Gitea Action
d010b59066 chore: update image tag to 016c930 [skip ci] 2026-02-19 13:10:26 +00:00
Luis Eduardo Estevao
016c93086c Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m13s
2026-02-19 10:05:51 -03:00
Luis Eduardo Estevao
8ae32f3a56 feat: implement customer service with methods for searching and retrieving customer data by name, CPF, or ID. 2026-02-19 10:05:46 -03:00
Gitea Action
35ea219c11 chore: update image tag to 90f2c2e [skip ci] 2026-02-19 13:01:57 +00:00
Luis Eduardo Estevao
90f2c2efee Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 1m19s
2026-02-19 10:00:35 -03:00
Luis Eduardo Estevao
366d6d1f4d feat: Add backoffice list controller and service for various data lookups and new sales customer, order, and pre-order services. Add parameter customerId para find payment plans 2026-02-19 10:00:29 -03:00
Gitea Action
1187693df8 chore: update image tag to 2095866 [skip ci] 2026-02-19 12:05:20 +00:00
9 changed files with 154 additions and 130 deletions

View File

@@ -7,4 +7,4 @@ spec:
spec:
containers:
- name: api
image: 172.35.0.216:3000/simplifique/vendaweb-api:3aa9673
image: 172.35.0.216:3000/simplifique/vendaweb-api:f1c0543

View File

@@ -3,4 +3,4 @@ kind: Deployment
metadata:
name: vendaweb-api
spec:
replicas: 15
replicas: 2

View File

@@ -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

View File

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

View File

@@ -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')
async getPaymentPlan(@Param('billindid') billingId: string) {
return this.listsServices.GetPaymentPlan(billingId);
@Get('paymentplan/:billindid/:customerId')
async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
return this.listsServices.GetPaymentPlan(billingId, customerId);
}
/**

View File

@@ -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", ' +
' NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' +
' FROM PCPLPAG ' +
' WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' +
' WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' +
' AND PCCOBPLPAG.CODCOB = :CODCOB ) '
' ORDER BY PCPAG.DESCRICAO ';
const paymentPlans = await queryRunner.query(sql, [billingId]);
const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",
NVL(PCPLPAG.NUMDIAS,0) as "numdias"
FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI
WHERE PCCLIENT.CODCLI = :CODCLI
AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999)
AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG
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,7 +129,7 @@ export class ListsService {
}
}
async GetBilling(clienteId: number){
async GetBilling(clienteId: number) {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -135,7 +139,7 @@ export class ListsService {
' FROM PCCOB ' +
' WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\' ' +
' 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 ' +
' EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
' ORDER BY PCCOB.CODCOB';
@@ -149,7 +153,7 @@ export class ListsService {
}
}
async GetPartners(){
async GetPartners() {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -170,13 +174,13 @@ 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" ' +
' ,TELEFONE as "phone" ' +
' ,IDCART as "idCart" ' +
@@ -195,7 +199,7 @@ export class ListsService {
}
}
async GetPlaces(){
async GetPlaces() {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -216,7 +220,7 @@ export class ListsService {
}
}
async GetStorePlaces(){
async GetStorePlaces() {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -237,7 +241,7 @@ export class ListsService {
}
}
async GetRamo(){
async GetRamo() {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -259,7 +263,7 @@ export class ListsService {
}
}
async GetStates(state: string){
async GetStates(state: string) {
const connection = new Connection(connectionOptions);
await connection.connect();
const queryRunner = connection.createQueryRunner();
@@ -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 {
}
}
}
}

View File

@@ -469,9 +469,9 @@ export class CustomerService {
async InitializeCustomer() {
const cliente = new Pcclient();
cliente.codusur1 = 1;
cliente.codplpag = 10;
cliente.codpraca = 119;
cliente.codcob = "D";
cliente.codplpag = 18;
cliente.codpraca = 169;
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;
}

View File

@@ -954,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);

View File

@@ -137,52 +137,52 @@ export class PreOrderService {
numeroSeq = numeroSeq + 1;
}
if (cart.shippingValue > 0) {
const itemPreOrder = new Pcorcavendai();
itemPreOrder.numorca = preOrder.numorca;
itemPreOrder.data = this.formatDate(new Date());
itemPreOrder.codcli = cart.idCustomer;
itemPreOrder.codprod = 48500;
itemPreOrder.codauxiliar = 48500;
itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
itemPreOrder.qt = 1;
itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
itemPreOrder.numcar = 0;
itemPreOrder.posicao = 'L';
itemPreOrder.st = 0;
itemPreOrder.vlcustocont = 0;
itemPreOrder.vlcustofin = 0;
itemPreOrder.vlcustoreal = 0;
itemPreOrder.vlcustorep = 0;
itemPreOrder.percom = 0;
itemPreOrder.perdesc = 0;
itemPreOrder.numseq = numeroSeq;
itemPreOrder.pvendabase = 0;
itemPreOrder.codst = await this.
sharedService.
getTaxId(48500,
cart.saleStore,
customer.estent);
itemPreOrder.custofinest = 0;
itemPreOrder.codauxiliar = 48500;
itemPreOrder.codfilialretira = cart.saleStore;
itemPreOrder.poriginal = 0;
itemPreOrder.pvendabase = 0;
itemPreOrder.pvenda1 = 0;
itemPreOrder.tipoentrega = 'EF';
console.log('Processo 3');
// if (cart.shippingValue > 0) {
// const itemPreOrder = new Pcorcavendai();
// itemPreOrder.numorca = preOrder.numorca;
// itemPreOrder.data = this.formatDate(new Date());
// itemPreOrder.codcli = cart.idCustomer;
// itemPreOrder.codprod = 48500;
// itemPreOrder.codauxiliar = 48500;
// itemPreOrder.codusur = (idRca > 0) ? idRca : cart.idSeller;
// itemPreOrder.qt = 1;
// itemPreOrder.pvenda = Number.parseFloat(cart.shippingValue.toString());
// itemPreOrder.ptabela = Number.parseFloat(cart.shippingValue.toString());
// itemPreOrder.numcar = 0;
// itemPreOrder.posicao = 'L';
// itemPreOrder.st = 0;
// itemPreOrder.vlcustocont = 0;
// itemPreOrder.vlcustofin = 0;
// itemPreOrder.vlcustoreal = 0;
// itemPreOrder.vlcustorep = 0;
// itemPreOrder.percom = 0;
// itemPreOrder.perdesc = 0;
// itemPreOrder.numseq = numeroSeq;
// itemPreOrder.pvendabase = 0;
// itemPreOrder.codst = await this.
// sharedService.
// getTaxId(48500,
// cart.saleStore,
// customer.estent);
// itemPreOrder.custofinest = 0;
// itemPreOrder.codauxiliar = 48500;
// itemPreOrder.codfilialretira = cart.saleStore;
// itemPreOrder.poriginal = 0;
// itemPreOrder.pvendabase = 0;
// itemPreOrder.pvenda1 = 0;
// itemPreOrder.tipoentrega = 'EF';
// console.log('Processo 3');
await queryRunner.manager
.createQueryBuilder()
.insert()
.into(Pcorcavendai)
.values(itemPreOrder)
.execute();
console.log('Processo 4');
// await queryRunner.manager
// .createQueryBuilder()
// .insert()
// .into(Pcorcavendai)
// .values(itemPreOrder)
// .execute();
// console.log('Processo 4');
numeroSeq = numeroSeq + 1;
}
// numeroSeq = numeroSeq + 1;
// }
//#region create PCORCAVENDAC
console.log('Processo 5' + cart);
@@ -209,8 +209,8 @@ export class PreOrderService {
preOrder.codsupervisor = supervisor[0].codsupervisor;
}
preOrder.codemitente = cart.userId;
preOrder.vlfrete = cart.shippingValue;
preOrder.vloutrasdesp = 0;
preOrder.vlfrete = 0;
preOrder.vloutrasdesp = cart.shippingValue;
preOrder.numitens = cart.itens.length;
preOrder.obs1 = cart.notation1;
preOrder.obs2 = cart.notation2;
@@ -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);