feat/painel-cliente #2
|
|
@ -60,4 +60,7 @@ export class Shopping {
|
|||
@Column({ name: 'CODTABELAFRETE' })
|
||||
codtabelafrete: number;
|
||||
|
||||
@Column({ name: 'CODPRACA' })
|
||||
codpraca: number;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
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,
|
||||
) { }
|
||||
}
|
||||
|
|
@ -1468,6 +1468,7 @@ export class SalesService {
|
|||
.query(sql, [cityId, cartId]);
|
||||
return deliveryTaxTable;
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
throw err;
|
||||
} finally {
|
||||
await queryRunner.release();
|
||||
|
|
@ -1502,7 +1503,20 @@ export class SalesService {
|
|||
}
|
||||
|
||||
async calculateDeliveryTaxOrder(dataDeliveryTax: any) {
|
||||
let cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode);
|
||||
console.log("json dataDeliveryTax", dataDeliveryTax);
|
||||
/*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) {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ 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')
|
||||
|
|
@ -82,6 +84,19 @@ 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 {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ 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 {
|
||||
|
|
@ -299,6 +301,58 @@ 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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue