Ajustes para simplifique
All checks were successful
Deploy NestJS API / build-and-push-deploy (push) Successful in 2m9s
All checks were successful
Deploy NestJS API / build-and-push-deploy (push) Successful in 2m9s
This commit is contained in:
@@ -44,7 +44,7 @@ export class CustomerService {
|
||||
' ,pccidade.codibge as "ibgeCode" ' +
|
||||
' ,pcclient.dtnasc as "birthdate" ' +
|
||||
' ,pcclient.codatv1 as "ramoId" ' +
|
||||
' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
// ' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
' ,pcclient.latitude as "latitude" ' +
|
||||
' ,pcclient.longitude as "longitude" ' +
|
||||
' ,pcclient.codmunicipio as "ibgeCode" ' +
|
||||
@@ -102,16 +102,16 @@ export class CustomerService {
|
||||
' ,pcclient.telent as "phone" ' +
|
||||
' ,pcclient.telcelent as "cellPhone" ' +
|
||||
' ,pcclient.ieent as "numberState" ' +
|
||||
' ,pcclient.codcategoria as "categoryId" ' +
|
||||
' ,pcclient.codsubcategoria as "subCategoryId" ' +
|
||||
// ' ,pcclient.codcategoria as "categoryId" ' +
|
||||
// ' ,pcclient.codsubcategoria as "subCategoryId" ' +
|
||||
' ,pcclient.codpraca as "placeId" ' +
|
||||
' ,pcclient.codusur1 as "sellerId" ' +
|
||||
' ,pccidade.codibge as "ibgeCode" ' +
|
||||
' ,pcclient.dtnasc as "birthdate" ' +
|
||||
' ,pcclient.codatv1 as "ramoId" ' +
|
||||
' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
// ' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
' ,pcclient.latitude as "latitude" ' +
|
||||
' ,pcclient.longitude as "longitude" ' +
|
||||
' ,pcclient.longitude as "longitude" ' +
|
||||
' ,pcclient.codmunicipio as "ibgeCode" ' +
|
||||
' ,pcclient.codcidade as "cityId" ' +
|
||||
' ,pcclient.tipoendereco as "addressType" ' +
|
||||
@@ -158,7 +158,7 @@ export class CustomerService {
|
||||
' ,pccidade.codibge as "ibgeCode" ' +
|
||||
' ,pcclient.dtnasc as "birthdate" ' +
|
||||
' ,pcclient.codatv1 as "ramoId" ' +
|
||||
' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
//' ,pcclient.meiocomunicacao as "communicate" ' +
|
||||
' ,pcclient.latitude as "latitude" ' +
|
||||
' ,pcclient.longitude as "longitude" ' +
|
||||
' ,pcclient.codmunicipio as "ibgeCode" ' +
|
||||
@@ -173,7 +173,7 @@ export class CustomerService {
|
||||
FROM PCPRACA
|
||||
WHERE PCPRACA.CODPRACA = ${customer[0].placeId}`);
|
||||
|
||||
return {...customer[0], place: place[0]};
|
||||
return { ...customer[0], place: place[0] };
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
throw error;
|
||||
@@ -267,16 +267,16 @@ export class CustomerService {
|
||||
newCustomer.telcelent = customer.cellPhone;
|
||||
newCustomer.celularwhatsapp = customer.cellPhone;
|
||||
newCustomer.codusur1 = customer.sellerId;
|
||||
newCustomer.codatv1 = ( customer.ramo != null && customer.ramo.id > 0 ) ? customer.ramo.id : newCustomer.codatv1;
|
||||
newCustomer.codatv1 = (customer.ramo != null && customer.ramo.id > 0) ? customer.ramo.id : newCustomer.codatv1;
|
||||
//Endereço de entrega
|
||||
newCustomer.cepent = customer.zipCode;
|
||||
newCustomer.enderent = customer.address.toUpperCase();
|
||||
newCustomer.numeroent = customer.addressNumber;
|
||||
if ( customer.complement !== null && customer.complement.length > 80 ) {
|
||||
newCustomer.complementoent = customer.complement.substring(0, 80 ).toUpperCase();
|
||||
if (customer.complement !== null && customer.complement.length > 80) {
|
||||
newCustomer.complementoent = customer.complement.substring(0, 80).toUpperCase();
|
||||
} else {
|
||||
if ( customer.complement != null ) {
|
||||
newCustomer.complementoent = customer.complement.toUpperCase();
|
||||
if (customer.complement != null) {
|
||||
newCustomer.complementoent = customer.complement.toUpperCase();
|
||||
}
|
||||
}
|
||||
newCustomer.bairroent = customer.neighborhood.toUpperCase();
|
||||
@@ -286,10 +286,10 @@ export class CustomerService {
|
||||
newCustomer.cepcom = customer.zipCode;
|
||||
newCustomer.endercom = customer.address.toUpperCase();
|
||||
newCustomer.numerocom = customer.addressNumber.toUpperCase();
|
||||
if ( customer.complement !== null && customer.complement.length > 80 ) {
|
||||
newCustomer.complementocom = customer.complement.substring(0, 80 ).toUpperCase();
|
||||
if (customer.complement !== null && customer.complement.length > 80) {
|
||||
newCustomer.complementocom = customer.complement.substring(0, 80).toUpperCase();
|
||||
} else {
|
||||
if ( customer.complement != null ) {
|
||||
if (customer.complement != null) {
|
||||
newCustomer.complementocom = customer.complement.toUpperCase();
|
||||
}
|
||||
}
|
||||
@@ -300,12 +300,12 @@ export class CustomerService {
|
||||
newCustomer.cepcob = customer.zipCode;
|
||||
newCustomer.endercob = customer.address.toUpperCase();
|
||||
newCustomer.numerocob = customer.addressNumber;
|
||||
if ( customer.complement !== null && customer.complement.length > 80 ) {
|
||||
newCustomer.complementocob = customer.complement.substring(0, 80 ).toUpperCase();
|
||||
if (customer.complement !== null && customer.complement.length > 80) {
|
||||
newCustomer.complementocob = customer.complement.substring(0, 80).toUpperCase();
|
||||
} else {
|
||||
if ( customer.complement ) {
|
||||
if (customer.complement) {
|
||||
newCustomer.complementocob = customer.complement.toUpperCase();
|
||||
}
|
||||
}
|
||||
}
|
||||
newCustomer.bairrocob = customer.neighborhood.toUpperCase();
|
||||
newCustomer.municcob = customer.city.toUpperCase();
|
||||
@@ -317,7 +317,7 @@ export class CustomerService {
|
||||
newCustomer.codmunicipio = Number.parseInt(customer.ibgeCode);
|
||||
newCustomer.codcidadecom = newCustomer.codcidade;
|
||||
newCustomer.dtnasc = customer.birthdate;
|
||||
newCustomer.meiocomunicacao = customer.communicate;
|
||||
// newCustomer.meiocomunicacao = customer.communicate;
|
||||
newCustomer.codfunccad = customer.idUser;
|
||||
newCustomer.codfunccadastro = customer.idUser;
|
||||
newCustomer.codfuncultalter = customer.idUser;
|
||||
@@ -341,7 +341,7 @@ export class CustomerService {
|
||||
city: customer.city, state: customer.state,
|
||||
allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
|
||||
category: customer.category, subCategory: customer.subCategory,
|
||||
place: customer.place, ramo: customer.ramo, meiocomunicacao: customer.communicate,
|
||||
place: customer.place, ramo: customer.ramo, /*meiocomunicacao: customer.communicate,*/
|
||||
latitude: customer.latitude, longitude: customer.longitude, ibgeCode: customer.ibgeCode,
|
||||
addressType: customer.addressType,
|
||||
};
|
||||
@@ -361,8 +361,8 @@ export class CustomerService {
|
||||
city: customer.city, state: customer.state,
|
||||
allowMessage: customer.allowMessage, cellPhone: customer.cellPhone,
|
||||
category: customer.category, subCategory: customer.subCategory,
|
||||
place: customer.place, meiocomunicacao: customer.communicate,
|
||||
ramo: customer.ramo, latitude: customer.latitude, longitude: customer.longitude,
|
||||
place: customer.place, /*meiocomunicacao: customer.communicate,*/
|
||||
ramo: customer.ramo, latitude: customer.latitude, longitude: customer.longitude,
|
||||
ibgeCode: customer.ibgeCode, addressType: customer.addressType,
|
||||
};
|
||||
}
|
||||
@@ -378,7 +378,7 @@ export class CustomerService {
|
||||
await queryRunner.connect();
|
||||
await queryRunner.startTransaction();
|
||||
try {
|
||||
console.log("MEIO DE COMUNICACAO: " + client.meiocomunicacao);
|
||||
//console.log("MEIO DE COMUNICACAO: " + client.meiocomunicacao);
|
||||
await queryRunner.manager
|
||||
.createQueryBuilder()
|
||||
.update(Pcclient)
|
||||
@@ -418,13 +418,13 @@ export class CustomerService {
|
||||
codmunicipio: client.codmunicipio,
|
||||
codcidadecom: client.codcidade,
|
||||
dtnasc: client.dtnasc,
|
||||
codatv1: client.codatv1,
|
||||
meiocomunicacao: client.meiocomunicacao,
|
||||
codatv1: client.codatv1,
|
||||
// meiocomunicacao: client.meiocomunicacao,
|
||||
codfuncultalter: client.codfuncultalter,
|
||||
dtultalter: client.dtultalter,
|
||||
dtultalter: client.dtultalter,
|
||||
latitude: client.latitude,
|
||||
longitude: client.longitude,
|
||||
tipoendereco: client.tipoendereco
|
||||
longitude: client.longitude,
|
||||
tipoendereco: client.tipoendereco
|
||||
})
|
||||
.where({ codcli: client.codcli })
|
||||
.execute();
|
||||
@@ -434,7 +434,7 @@ export class CustomerService {
|
||||
await queryRunner.rollbackTransaction();
|
||||
throw err;
|
||||
} finally {
|
||||
if ( queryRunner.isTransactionActive) {
|
||||
if (queryRunner.isTransactionActive) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
}
|
||||
await queryRunner.release();
|
||||
@@ -532,13 +532,13 @@ export class CustomerService {
|
||||
const connection = new Connection(connectionOptions);
|
||||
const queryRunner = connection.createQueryRunner();
|
||||
try {
|
||||
|
||||
await connection.connect();
|
||||
|
||||
await queryRunner.connect();
|
||||
|
||||
// lets now open a new transaction:
|
||||
await queryRunner.startTransaction();
|
||||
await connection.connect();
|
||||
|
||||
await queryRunner.connect();
|
||||
|
||||
// lets now open a new transaction:
|
||||
await queryRunner.startTransaction();
|
||||
|
||||
|
||||
let sql = `SELECT PROXNUMCLI as "proxnumcli" FROM PCCONSUM WHERE 1 = 1 FOR UPDATE`;
|
||||
@@ -566,14 +566,14 @@ export class CustomerService {
|
||||
|
||||
} catch (err) {
|
||||
// since we have errors let's rollback changes we made
|
||||
if ( queryRunner.isTransactionActive) {
|
||||
if (queryRunner.isTransactionActive) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
}
|
||||
console.log(err);
|
||||
return -1;
|
||||
|
||||
} finally {
|
||||
if ( queryRunner.isTransactionActive) {
|
||||
if (queryRunner.isTransactionActive) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
}
|
||||
// you need to release query runner which is manually created:
|
||||
@@ -603,7 +603,7 @@ export class CustomerService {
|
||||
console.log(err);
|
||||
throw err;
|
||||
} finally {
|
||||
if ( queryRunner.isTransactionActive) {
|
||||
if (queryRunner.isTransactionActive) {
|
||||
await queryRunner.rollbackTransaction();
|
||||
}
|
||||
await queryRunner.release();
|
||||
|
||||
Reference in New Issue
Block a user