package.json

@@ -20,7 +20,6 @@
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
     "dayjs": "^1.11.13",
-    "exceljs": "^4.4.0",
     "mysql2": "^3.11.5",
     "nodemailer": "^7.0.5",
     "swagger-ui-dist": "^5.18.2",

src/controller/order.controller.ts

@@ -115,10 +115,10 @@ export class OrderController {
   @Post('/updateOrderItems/:orderId')
   async updateOrderItems(
     @Param('orderId') orderId: number, 
-    @Body() data: any,
+    @Body() data: any
   ) {
     try {
-      const res = await this.orderService.updateExchangeOrder(orderId, data);
+      const res = await this.orderService.updateOrderSales(orderId, data);
       return successResponse(res);
     } catch (error) {
       return errorResponse(error?.message || '更新失败');
@@ -221,18 +221,4 @@ export class OrderController {
       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 || '获取失败');
-    }
-  }
 }

src/controller/wp_product.controller.ts

@@ -21,9 +21,7 @@ import {
 } from '../dto/wp_product.dto';
 import { WPService } from '../service/wp.service';
 import { WpSite } from '../interface';
-import {
+
-  ProductsRes,
-} from '../dto/reponse.dto';
 @Controller('/wp_product')
 export class WpProductController {
   @Inject()
@@ -189,19 +187,4 @@ export class WpProductController {
       return errorResponse(error.message || '产品变体更新失败');
     }
   }
-
-   @ApiOkResponse({
-      description: '通过name搜索产品/订单',
-      type: ProductsRes,
-    })
-    @Get('/search')
-    async searchProducts(@Query('name') name: string) {
-      try {
-        // 调用服务获取产品数据
-        const products = await this.wpProductService.findProductsByName(name);
-        return successResponse(products);
-      } catch (error) {
-        return errorResponse(error.message || '获取数据失败');
-      }
-    }
 }

src/entity/order.entity.ts

@@ -244,15 +244,14 @@ export class Order {
   utm_source: string;
 
   @ApiProperty()
-  @Column({ default: false })
+  @Column({ default: '' })
   @Expose()
-  is_exchange: boolean;
+  is_exchange: string;
 
   @ApiProperty()
-  @Column('decimal', { precision: 10, scale: 0, default: 0 })
+  @Column({ default: '' })
   @Expose()
-  exchange_frequency: number;
+  exchange_frequency: string;
-
 
   @ApiProperty({
     example: '2022-12-12 11:11:11',

src/enums/base.enum.ts

@@ -31,22 +31,19 @@ export enum StockRecordOperationType {
   IN = 'in',
   OUT = 'out',
 }
-// 	Order status. Options: pending, processing, on-hold, completed, cancelled, refunded, failed and trash. Default is pending.
+
-// 原始订单状态
 export enum OrderStatus {
-  PENDING = 'pending', // default // 待付款
+  PENDING = 'pending',
-  PROCESSING = 'processing', // 正在处理
+  PROCESSING = 'processing',
-  ON_HOLD = 'on-hold',  // 保留
+  COMPLETED = 'completed',
-  COMPLETED = 'completed', // 已完成
+  ON_HOLD = 'on-hold',
-  CANCEL = 'cancelled', // 已取消
+  CANCEL = 'cancelled',
-  REFUNDED = 'refunded', // 已退款
+  REFUNDED = 'refunded',
-  FAILED = 'failed', // 失败订单
+  FAILED = 'failed',
-  DRAFT = 'draft', // 草稿
+  DRAFT = 'draft',
-  // TRASH = 'trash',
+  REFUND_REQUESTED = 'refund_requested', // 已申请退款
-  // refund 也就是退款相关的状态
+  REFUND_APPROVED = 'refund_approved', // 退款申请已通过
-  RETURN_REQUESTED = 'return-requested', // 已申请退款
+  REFUND_CANCELLED = 'refund_cancelled', // 已取消退款
-  RETURN_APPROVED = 'return-approved', // 退款申请已通过
-  RETURN_CANCELLED = 'return-cancelled', // 已取消退款
 }
 
 export enum ErpOrderStatus {
@@ -59,9 +56,9 @@ export enum ErpOrderStatus {
   AFTER_SALE_PROCESSING = 'after_sale_pending', // 售后处理中
   PENDING_RESHIPMENT = 'pending_reshipment', // 待补发
   PENDING_REFUND = 'pending_refund', // 待退款
-  RETURN_REQUESTED = 'return-requested', // 已申请退款
+  REFUND_REQUESTED = 'refund_requested', // 已申请退款
-  RETURN_APPROVED = 'return-approved', // 退款申请已通过
+  REFUND_APPROVED = 'refund_approved', // 退款申请已通过
-  RETURN_CANCELLED = 'return-cancelled', // 已取消退款
+  REFUND_CANCELLED = 'refund_cancelled', // 已取消退款
 }
 
 export enum ShipmentType {

src/service/order.service.ts

@@ -31,7 +31,6 @@ import { ShipmentItem } from '../entity/shipment_item.entity';
 import { UpdateStockDTO } from '../dto/stock.dto';
 import { StockService } from './stock.service';
 import { OrderSaleOriginal } from '../entity/order_item_original.entity';
-import { createExcel } from '../utils/files.util';
 
 @Provide()
 export class OrderService {
@@ -112,33 +111,7 @@ export class OrderService {
     const order = await this.wPService.getOrder(siteId, orderId);
     await this.syncSingleOrder(siteId, order, true);
   }
-  // 订单状态切换表
+
-  orderAutoNextStatusMap = {
-    [OrderStatus.RETURN_APPROVED]: OrderStatus.ON_HOLD, // 退款申请已通过转为 on-hold
-    [OrderStatus.RETURN_CANCELLED]: OrderStatus.REFUNDED // 已取消退款转为 refunded
-  }
-  // 由于 wordpress 订单状态和 我们的订单状态 不一致，需要做转换
-  async autoUpdateOrderStatus(siteId: string, order: any) {
-    console.log('更新订单状态', order)
-    // 其他状态保持不变
-    const originStatus = order.status;
-    // 如果有值就赋值
-    if (!this.orderAutoNextStatusMap[originStatus]) {
-      return
-    }
-    try {
-      const site = this.sites.find(v => v.id === siteId);
-      if (!site) {
-        throw new Error(`更新订单信息，但失败，原因为 ${siteId} 的站点信息不存在`)
-      }
-      // 同步更新回 wordpress 的 order 状态
-      await this.wPService.updateOrder(site, order.id, { status: order.status });
-      order.status = this.orderAutoNextStatusMap[originStatus];
-    } catch (error) {
-      console.error('更新订单状态失败，原因为：', error)
-    }
-  }
-  // wordpress 发来，
   async syncSingleOrder(siteId: string, order: any, forceUpdate = false) {
     let {
       line_items,
@@ -148,12 +121,9 @@ export class OrderService {
       refunds,
       ...orderData
     } = order;
-    console.log('同步进单个订单', order)
     const existingOrder = await this.orderModel.findOne({
       where: { externalOrderId: order.id, siteId: siteId },
     });
-    // 更新状态
-    await this.autoUpdateOrderStatus(siteId, order);
     const orderId = (await this.saveOrder(siteId, orderData)).id;
     const externalOrderId = order.id;
     if (
@@ -260,7 +230,7 @@ export class OrderService {
     const customer = await this.customerModel.findOne({
       where: { email: order.customer_email },
     });
-    if (!customer) {
+    if(!customer) {
       await this.customerModel.save({
         email: order.customer_email,
         rate: 0,
@@ -293,12 +263,12 @@ export class OrderService {
         return ErpOrderStatus.REFUNDED;
       case OrderStatus.FAILED:
         return ErpOrderStatus.FAILED;
-      case OrderStatus.RETURN_REQUESTED:
+      case OrderStatus.REFUND_REQUESTED:
-        return ErpOrderStatus.RETURN_REQUESTED;
+        return ErpOrderStatus.REFUND_REQUESTED;
-      case OrderStatus.RETURN_APPROVED:
+      case OrderStatus.REFUND_APPROVED:
-        return ErpOrderStatus.RETURN_APPROVED;
+        return ErpOrderStatus.REFUND_APPROVED;
-      case OrderStatus.RETURN_CANCELLED:
+      case OrderStatus.REFUND_CANCELLED:
-        return ErpOrderStatus.RETURN_CANCELLED;
+        return ErpOrderStatus.REFUND_CANCELLED;
       default:
         return ErpOrderStatus.PENDING;
     }
@@ -602,35 +572,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({
     externalOrderId,
     siteId,
@@ -656,7 +597,7 @@ export class OrderService {
         o.total as total,
         o.date_created as date_created,
         o.customer_email as customer_email,
-        o.exchange_frequency as exchange_frequency,
+      
         o.transaction_id as transaction_id,
         o.orderStatus as orderStatus,
         o.customer_ip_address as customer_ip_address,
@@ -732,7 +673,7 @@ export class OrderService {
       sqlQuery += ` AND o.payment_method like "%${payment_method}%" `;
       totalQuery += ` AND o.payment_method like "%${payment_method}%" `;
     }
-    const user = await this.userModel.findOneBy({ id: userId });
+    const user = await this.userModel.findOneBy({id: userId});
     if (user?.permissions?.includes('order-10-days')) {
       sqlQuery += ` AND o.date_created >= ?`;
       totalQuery += ` AND o.date_created >= ?`;
@@ -1218,7 +1159,7 @@ export class OrderService {
 
        // update order_item_origin if not exist
        const order_item_origin_count = await this.orderItemOriginalModel.countBy({ orderId: id });
-      if (order_item_origin_count === 0 && items.length != 0) {
+      if (order_item_origin_count === 0 && items.length!=0) {
         items.forEach(async sale => {
           const { id: saleId, ...saleData } = sale;
           await this.orderItemOriginalModel.save(saleData);
@@ -1427,7 +1368,7 @@ export class OrderService {
         const productRepo = manager.getRepository(Product);
 
         const order = await orderRepo.findOneBy({ id: orderId });
-        let product: Product;
+        let product:Product;
         await orderSaleRepo.delete({ orderId });
         for (const sale of sales) {
           product  = await productRepo.findOneBy({ sku: sale.sku });
@@ -1442,97 +1383,7 @@ export class OrderService {
           });
         };
 
-
+        //await orderRepo.save();
-      }).catch(error => {
-        transactionError = error;
-      });
-
-      if (transactionError !== undefined) {
-        throw new Error(`更新物流信息错误：${transactionError.message}`);
-      }
-      return true;
-    } catch (error) {
-      throw new Error(`更新发货产品失败：${error.message}`);
-    }
-  }
-
-  //换货确认按钮改成调用这个方法
-  //换货功能更新OrderSale和Orderitem数据
-  async updateExchangeOrder(orderId: number, data: any) {
-    try {
-      const dataSource = this.dataSourceManager.getDataSource('default');
-      let transactionError = undefined;
-
-      await dataSource.transaction(async manager => {
-        const orderRepo = manager.getRepository(Order);
-        const orderSaleRepo = manager.getRepository(OrderSale);
-        const orderItemRepo = manager.getRepository(OrderItem);
-        const OrderItemOriginalRepo = manager.getRepository(OrderItemOriginal);
-
-        const productRepo = manager.getRepository(Product);
-        const WpProductRepo = manager.getRepository(WpProduct);
-
-        const order = await orderRepo.findOneBy({ id: orderId });
-        let product: Product;
-        let wpProduct: WpProduct;
-        let wpOrderItemOriginal: OrderItemOriginal;
-        await orderSaleRepo.delete({ orderId });
-        await orderItemRepo.delete({ orderId });
-        for (const sale of data['sales']) {
-          product = await productRepo.findOneBy({ sku: sale['sku'] });
-          await orderSaleRepo.save({
-            orderId,
-            siteId: order.siteId,
-            productId: product.id,
-            name: product.name,
-            sku: sale['sku'],
-            quantity: sale['quantity'],
-          });
-        };
-
-        for (const item of data['items']) {
-          wpProduct = await WpProductRepo.findOneBy({ sku: item['sku'] });
-          wpOrderItemOriginal = await OrderItemOriginalRepo.findOneBy({ sku: item['sku'] });
-          let externalVariationId = wpOrderItemOriginal?.externalVariationId;
-          let price = wpOrderItemOriginal?.price;
-          if (wpOrderItemOriginal == null) {
-            externalVariationId = '0';
-            price = 0;
-          }
-          await orderItemRepo.save({
-            orderId,
-            siteId: order.siteId,
-            productId: wpProduct.id,
-            name: wpProduct.name,
-            externalOrderId: order.externalOrderId,
-            externalProductId: wpProduct.externalProductId,
-            externalVariationId: externalVariationId,
-            price: price,
-            sku: item['sku'],
-            quantity: item['quantity'],
-          });
-
-        };
-
-        //将是否换货状态改为true
-        await orderRepo.update(
-          order.id
-          , {
-            is_exchange: true
-          });
-
-        //查询这个用户换过多少次货
-        const counts = await orderRepo.countBy({
-          is_editable: true,
-          customer_email: order.customer_email,
-        });
-
-        //批量更新当前用户换货次数
-        await orderRepo.update({
-          customer_email: order.customer_email
-        }, {
-          exchange_frequency: counts
-        });
 
       }).catch(error => {
         transactionError = error;

src/service/wp_product.service.ts

@@ -507,42 +507,4 @@ const excludeValues = [];
     //await this.variationModel.delete({ siteId, externalProductId: productId });
     //await this.wpProductModel.delete({ siteId, externalProductId: productId });
   }
-
-
-  
-  async findProductsByName(name: string): Promise<WpProduct[]> {
-    const nameFilter = name ? name.split(' ').filter(Boolean) : [];
-    const query = this.wpProductModel.createQueryBuilder('product');
-
-    // 保证 sku 不为空
-    query.where('product.sku IS NOT NULL AND product.on_delete = false');
-
-    if (nameFilter.length > 0 || name) {
-      const params: Record<string, string> = {};
-      const conditions: string[] = [];
-
-      // 英文名关键词全部匹配（AND）
-      if (nameFilter.length > 0) {
-        const nameConds = nameFilter.map((word, index) => {
-          const key = `name${index}`;
-          params[key] = `%${word}%`;
-          return `product.name LIKE :${key}`;
-        });
-        conditions.push(`(${nameConds.join(' AND ')})`);
-      }
-
-      // 中文名模糊匹配
-      if (name) {
-        params['nameCn'] = `%${name}%`;
-        conditions.push(`product.nameCn LIKE :nameCn`);
-      }
-
-      // 英文名关键词匹配 OR 中文名匹配
-      query.andWhere(`(${conditions.join(' OR ')})`, params);
-    }
-
-    query.take(50);
-    
-    return await query.getMany();
-  }
 }