Compare commits
No commits in common. "main" and "main" have entirely different histories.
|
|
@ -20,7 +20,6 @@
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"exceljs": "^4.4.0",
|
|
||||||
"mysql2": "^3.11.5",
|
"mysql2": "^3.11.5",
|
||||||
"nodemailer": "^7.0.5",
|
"nodemailer": "^7.0.5",
|
||||||
"swagger-ui-dist": "^5.18.2",
|
"swagger-ui-dist": "^5.18.2",
|
||||||
|
|
|
||||||
|
|
@ -221,18 +221,4 @@ export class OrderController {
|
||||||
return errorResponse(error?.message || '获取失败');
|
return errorResponse(error?.message || '获取失败');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOkResponse()
|
|
||||||
@Get('/excel/price')
|
|
||||||
async getOrdersPriceInExcel() {
|
|
||||||
try {
|
|
||||||
return successResponse(await this.orderService.getOrdersPriceInExcel({
|
|
||||||
siteId: 0,
|
|
||||||
startDate: 0,
|
|
||||||
endDate: 0
|
|
||||||
}));
|
|
||||||
} catch (error) {
|
|
||||||
return errorResponse(error?.message || '获取失败');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ import { ShipmentItem } from '../entity/shipment_item.entity';
|
||||||
import { UpdateStockDTO } from '../dto/stock.dto';
|
import { UpdateStockDTO } from '../dto/stock.dto';
|
||||||
import { StockService } from './stock.service';
|
import { StockService } from './stock.service';
|
||||||
import { OrderSaleOriginal } from '../entity/order_item_original.entity';
|
import { OrderSaleOriginal } from '../entity/order_item_original.entity';
|
||||||
import { createExcel } from '../utils/files.util';
|
|
||||||
|
|
||||||
@Provide()
|
@Provide()
|
||||||
export class OrderService {
|
export class OrderService {
|
||||||
|
|
@ -602,35 +601,6 @@ export class OrderService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async getOrdersPriceInExcel({
|
|
||||||
siteId,
|
|
||||||
startDate,
|
|
||||||
endDate
|
|
||||||
}) {
|
|
||||||
const orders = await this.orderModel.find({where: {
|
|
||||||
status: In([OrderStatus.PROCESSING, OrderStatus.COMPLETED])
|
|
||||||
}});
|
|
||||||
// const orders = await this.orderModel.findBy({
|
|
||||||
// status: OrderStatus.PROCESSING
|
|
||||||
// });
|
|
||||||
const arr = [];
|
|
||||||
arr.push(['id', 'price', 'discount_total', 'site_name', 'date_created', 'date_completed']);
|
|
||||||
console.log('arr', arr);
|
|
||||||
orders.forEach(order => {
|
|
||||||
let site = this.sites.find(site => site.id === order.siteId);
|
|
||||||
arr.push([
|
|
||||||
order.externalOrderId,
|
|
||||||
order.total - order.total_tax - order.shipping_total,
|
|
||||||
order.discount_total,
|
|
||||||
site?.siteName,
|
|
||||||
order.date_created,
|
|
||||||
order.date_completed
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
const path = await createExcel(arr);
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getOrders({
|
async getOrders({
|
||||||
externalOrderId,
|
externalOrderId,
|
||||||
siteId,
|
siteId,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue