Improvement: 订单请求接口添加payment_method相关内容

src/dto/order.dto.ts

@@ -83,6 +83,10 @@ export class QueryOrderDTO {
   @ApiProperty({ type: 'enum', enum: ErpOrderStatus })
   @Rule(RuleType.string().valid(...Object.values(ErpOrderStatus)))
   status: ErpOrderStatus;
+
+  @ApiProperty()
+  @Rule(RuleType.string())
+  payment_method: string;
 }
 
 export class QueryOrderSalesDTO {

src/dto/stock.dto.ts

@@ -51,6 +51,18 @@ export class QueryStockRecordDTO {
   @ApiProperty()
   @Rule(RuleType.string())
   productName: string;
+
+  @ApiProperty()
+  @Rule(RuleType.string())
+  operationType: string;
+
+  @ApiProperty()
+  @Rule(RuleType.date())
+  startDate: Date;
+
+  @ApiProperty()
+  @Rule(RuleType.date())
+  endDate: Date;
 }
 export class QueryPurchaseOrderDTO {
   @ApiProperty({ example: '1', description: '页码' })

src/service/order.service.ts

@@ -549,6 +549,7 @@ export class OrderService {
     current,
     pageSize,
     customer_email,
+    payment_method,
   }, userId = undefined) {
     const parameters: any[] = [];
 
@@ -571,6 +572,7 @@ export class OrderService {
         o.customer_note as customer_note,
         o.shipping as shipping,
         o.billing as billing,
+        o.payment_method as payment_method,
         cs.order_count as order_count,
         cs.total_spent as total_spent,
         COALESCE(
@@ -632,6 +634,10 @@ export class OrderService {
       totalQuery += ` AND o.date_created <= ?`;
       parameters.push(endDate);
     }
+    if (payment_method) {
+      sqlQuery += ` AND o.payment_method like "%${payment_method}%" `;
+      totalQuery += ` AND o.payment_method like "%${payment_method}%" `;
+    }
     const user = await this.userModel.findOneBy({id: userId});
     if (user?.permissions?.includes('order-10-days')) {
       sqlQuery += ` AND o.date_created >= ?`;

src/service/stock.service.ts

@@ -1,5 +1,5 @@
 import { Provide } from '@midwayjs/core';
-import { Between, Like, Repository } from 'typeorm';
+import { Between, Like, Repository, LessThan, MoreThan } from 'typeorm';
 import { Stock } from '../entity/stock.entity';
 import { StockRecord } from '../entity/stock_record.entity';
 import { paginate } from '../utils/paginate.util';
@@ -350,11 +350,18 @@ export class StockService {
       stockPointId,
       productSku,
       productName,
+      operationType,
+      startDate,
+      endDate,
     } = query;
 
     const where: any = {};
     if (stockPointId) where.stockPointId = stockPointId;
     if (productSku) where.productSku = productSku;
+    if (operationType) where.operationType = operationType;
+    if (startDate) where.createdAt = MoreThan(startDate);
+    if (endDate) where.createdAt = LessThan(endDate);
+    if (startDate && endDate) where.createdAt = Between(startDate, endDate);
     const queryBuilder = this.stockRecordModel
       .createQueryBuilder('stock_record')
       .leftJoin(Product, 'product', 'product.sku = stock_record.productSku')

src/service/wp.service.ts

@@ -240,7 +240,6 @@ export class WPService {
       manage_stock: false, // 为true的时候，用quantity控制库存，为false时，直接用stock_status控制
       stock_status,
     });
-    console.log('res', res);
     return res;
   }