fix(logistics): 修复货运平台courierCompany字段处理逻辑

当courierCompany为"最优物流"时设置为空字符串，否则使用原值

src/controller/product.controller.ts

@@ -201,7 +201,7 @@ export class ProductController {
   @Get('/site-sku/:siteSku')
   async getProductBySiteSku(@Param('siteSku') siteSku: string) {
     try {
-      const product = await this.productService.findProductBySiteSku(siteSku);
+      const product = await this.productService.getProductBySiteSku(siteSku);
       return successResponse(product);
     } catch (error) {
       return errorResponse(error.message || '获取数据失败');

src/controller/site-product.controller.ts

@@ -0,0 +1,90 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Inject,
+  Post,
+  Query,
+} from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { ILogger } from '@midwayjs/logger';
+import { ApiOkResponse } from '@midwayjs/swagger';
+import { SiteProductService } from '../service/site-product.service';
+import { errorResponse, successResponse } from '../utils/response.util';
+
+@Controller('/site-product')
+export class SiteProductController {
+  @Inject()
+  siteProductService: SiteProductService;
+
+  @Inject()
+  ctx: Context;
+
+  @Inject()
+  logger: ILogger;
+
+  @ApiOkResponse({
+    description: '获取站点商品列表',
+  })
+  @Get('/list')
+  async getSiteProductList(
+    @Query('current') current: number = 1,
+    @Query('pageSize') pageSize: number = 10,
+    @Query('siteId') siteId: number,
+    @Query('name') name: string,
+    @Query('sku') sku: string
+  ) {
+    try {
+      const data = await this.siteProductService.getSiteProductList({
+        current,
+        pageSize,
+        siteId,
+        name,
+        sku,
+      });
+      return successResponse(data);
+    } catch (error) {
+      this.logger.error('获取站点商品列表失败', error);
+      return errorResponse(error?.message || error);
+    }
+  }
+
+  @ApiOkResponse({
+    description: '同步站点商品',
+  })
+  @Post('/sync')
+  async syncSiteProducts(@Body('siteId') siteId: number) {
+    try {
+      const result = await this.siteProductService.syncSiteProducts(siteId);
+      return successResponse(result);
+    } catch (error) {
+      this.logger.error('同步站点商品失败', error);
+      return errorResponse(error?.message || error);
+    }
+  }
+
+  @ApiOkResponse({
+    description: '批量修改站点商品价格',
+  })
+  @Post('/batch-update-price')
+  async batchUpdatePrice(
+    @Body('siteId') siteId: number,
+    @Body('productIds') productIds: string[],
+    @Body('price') price: number
+  ) {
+    try {
+      const affected = await this.siteProductService.batchUpdatePrice(
+        siteId,
+        productIds,
+        price
+      );
+      return successResponse({
+        affected,
+        message: `成功修改 ${affected} 个商品的价格`,
+      });
+    } catch (error) {
+      this.logger.error('批量修改站点商品价格失败', error);
+      return errorResponse(error?.message || error);
+    }
+  }
+}

src/dto/logistics.dto.ts

@@ -23,6 +23,10 @@ export class ShipmentBookDTO {
   @ApiProperty()
   @Rule(RuleType.string())
   shipmentPlatform: string;
+
+  @ApiProperty()
+  @Rule(RuleType.string())
+  courierCompany: string;
 }
 
 export class ShipmentFeeBookDTO {
@@ -30,6 +34,8 @@ export class ShipmentFeeBookDTO {
   @ApiProperty()
   shipmentPlatform: string;
   @ApiProperty()
+  courierCompany: string;
+  @ApiProperty()
   stockPointId: number;
   @ApiProperty()
   sender: string;

src/entity/product.entity.ts

@@ -99,7 +99,6 @@ export class Product {
   @OneToMany(() => ProductStockComponent, (component) => component.product, { cascade: true })
   components: ProductStockComponent[];
 
-
   // 站点 SKU 关联
   @ApiProperty({ description: '站点 SKU关联', type: SiteSku, isArray: true })
   @OneToMany(() => SiteSku, siteSku => siteSku.product, { cascade: true })

src/entity/site-product.entity.ts

@@ -76,6 +76,10 @@ export class SiteProduct {
   @CreateDateColumn()
   createdAt: Date;
 
+  @ApiProperty({ description: '价格' })
+  @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
+  price: number;
+
   @ApiProperty({
     example: '2022-12-12 11:11:11',
     description: '更新时间',

src/service/Wintopay.service.ts

@@ -0,0 +1,96 @@
+import { Inject, Provide } from '@midwayjs/core';
+import axios from 'axios';
+import dayjs = require('dayjs');
+import utc = require('dayjs/plugin/utc');
+import timezone = require('dayjs/plugin/timezone');
+
+// 扩展dayjs功能
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
+
+// Wintopay 物流更新请求接口
+interface LogisticsUpdateRequest {
+  trade_id: string; // 订单的流水号
+  track_number: string; // 物流单号
+  track_brand: string; // 物流公司编号
+}
+
+// Wintopay 物流更新响应接口
+interface LogisticsUpdateResponse {
+  code: string;
+  message: string;
+  data: {
+    trade_id: string;
+    track_brand: string;
+    track_number: string;
+    time: number;
+  };
+  error: any;
+  request_id: string;
+}
+
+@Provide()
+export class WintopayService {
+  @Inject() logger;
+  
+    // 默认配置
+    private config = {
+    //测试环境配置，在生产环境记得换掉    
+        apiBaseUrl: 'https://stage-merchant-api.wintopay.com',
+     Authorization: 'Bearer kV8w1er8dFw9p9g2kb0mer398hD8hfWk',
+    };
+
+      // 发送请求
+  private async sendRequest<T>(url: string, data: any): Promise<T> {
+    try {
+      const headers = {
+        'Content-Type': 'application/json',
+        'Authorization': this.config.Authorization,
+      };
+
+      // 发送请求 - 临时禁用SSL证书验证以解决UNABLE_TO_VERIFY_LEAF_SIGNATURE错误
+      const response = await axios.post<T>(
+        `${this.config.apiBaseUrl}${url}`,
+        data,
+        {
+          headers,
+          httpsAgent: new (require('https').Agent)({
+            rejectUnauthorized: false
+          })
+        }
+      );
+
+      return response.data;
+    } catch (error) {
+      this.logger.error('Wintopay API请求失败:', error);
+      throw error;
+    }
+  }
+
+
+  /**
+   * 更新订单物流信息
+   * @param params 物流更新参数
+   * @returns 物流更新响应
+   */
+  async logisticsUpdate(params: LogisticsUpdateRequest): Promise<LogisticsUpdateResponse> {
+    try {
+      this.logger.info('开始更新物流信息:', params);
+      
+      const response = await this.sendRequest<LogisticsUpdateResponse>('/v1/logistics/update', params);
+      
+      this.logger.info('物流更新成功:', response);
+      return response;
+    } catch (error: any) {
+      this.logger.error('物流更新失败:', error);
+      
+      // 处理API返回的错误
+      if (error.response?.data) {
+        throw new Error(`物流更新失败: ${error.response.data.message || '未知错误'}`);
+      }
+      
+      throw new Error(`物流更新请求失败: ${error.message || '网络错误'}`);
+    }
+  }
+}

src/service/freightwaves.service.ts

@@ -247,6 +247,9 @@ export class FreightwavesService {
     };
 
     const response = await this.sendRequest<RateTryResponseData>('/shipService/order/rateTry', requestData);
+    if (response.code !== '00000200') {
+      throw new Error(response.msg);
+    }
     return response.data;
   }
 
@@ -262,7 +265,10 @@ export class FreightwavesService {
     };
 
     const response = await this.sendRequest<CreateOrderResponseData>('/shipService/order/createOrder', requestData);
-    return response;
+    if (response.code !== '00000200') {
+      throw new Error(response.msg);
+    }
+    return response.data;
   }
 
   /**
@@ -295,6 +301,9 @@ export class FreightwavesService {
     };
 
     const response = await this.sendRequest<ModifyOrderResponseData>('/shipService/order/modifyOrder', requestData);
+    if (response.code !== '00000200') {
+      throw new Error(response.msg);
+    }
     return response.data;
   }
 
@@ -309,6 +318,9 @@ export class FreightwavesService {
       partner: this.config.partner,
     };
     const response = await this.sendRequest<RefundOrderResponseData>('/shipService/order/refundOrder', requestData);
+    if (response.code !== '00000200') {
+      throw new Error(response.msg);
+    }
     return response.data;
   }
 

src/service/logistics.service.ts

@@ -327,17 +327,20 @@ export class LogisticsService {
       let resShipmentFee: any;
       if (data.shipmentPlatform === 'uniuni') {
         resShipmentFee = await this.uniExpressService.getRates(reqBody);
-      } else if (data.shipmentPlatform === 'freightwaves') {
-        const fre_reqBody = await this.convertToFreightwavesRateTry(data);
-        resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody);
-      } else {
-        throw new Error('不支持的运单平台');
-      }
-
         if (resShipmentFee.status !== 'SUCCESS') {
           throw new Error(resShipmentFee.ret_msg);
         }
         return resShipmentFee.data.totalAfterTax * 100;
+      } else if (data.shipmentPlatform === 'freightwaves') {
+        const fre_reqBody = await this.convertToFreightwavesRateTry(data);
+        resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody);
+        return resShipmentFee.totalAmount * 100;
+      } else {
+        throw new Error('不支持的运单平台');
+      }
+
+
+
     } catch (e) {
       throw e;
     }
@@ -360,12 +363,7 @@ export class LogisticsService {
     try {
       resShipmentOrder = await this.mepShipment(data, order);
 
-      // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
-      if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') {
       order.orderStatus = ErpOrderStatus.COMPLETED;
-      } else {
-        throw new Error('运单生成失败');
-      }
       const dataSource = this.dataSourceManager.getDataSource('default');
       let transactionError = undefined;
       let shipmentId = undefined;
@@ -384,8 +382,8 @@ export class LogisticsService {
           unique_id = resShipmentOrder.data.uni_order_sn;
           state = resShipmentOrder.data.uni_status_code;
         } else {
-          co = resShipmentOrder.data?.shipOrderId;
+          co = resShipmentOrder.shipOrderId;
-          unique_id = resShipmentOrder.data?.shipOrderId;
+          unique_id = resShipmentOrder.shipOrderId;
           state = ErpOrderStatus.COMPLETED;
         }
 
@@ -464,7 +462,7 @@ export class LogisticsService {
         }
       };
     } catch (error) {
-      if (resShipmentOrder.status === 'SUCCESS') {
+      if (resShipmentOrder?.status === 'SUCCESS') {
         await this.uniExpressService.deleteShipment(resShipmentOrder.data.tno);
       }
       throw new Error(`上游请求错误:${error}`);
@@ -728,12 +726,23 @@ export class LogisticsService {
         };
         // 添加运单
         resShipmentOrder = await this.uniExpressService.createShipment(reqBody);
+
+        // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
+        if (resShipmentOrder.status !== 'SUCCESS') {
+          throw new Error('运单生成失败');
+        }
       }
 
       if (data.shipmentPlatform === 'freightwaves') {
+
+        let courierCompany: string = "";
+        if (data.courierCompany != "最优物流") {
+          courierCompany = data.courierCompany;
+        }
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
-          shipCompany: 'UPSYYZ7000NEW',
+          // shipCompany: 'UPSYYZ7000NEW',
+          shipCompany: courierCompany,
           partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
@@ -798,15 +807,20 @@ export class LogisticsService {
         };
 
         resShipmentOrder = await this.freightwavesService.createOrder(reqBody); // 创建订单
+
         //tms只返回了物流订单号，需要查询一次来获取完整的物流信息
         const queryRes = await this.freightwavesService.queryOrder({ shipOrderId: resShipmentOrder.shipOrderId }); // 查询订单
-        resShipmentOrder.push(queryRes);
+        return {
+          ...resShipmentOrder,
+          ...queryRes
+        }
       }
 
       return resShipmentOrder;
     } catch (error) {
-      console.log('物流订单处理失败:', error); // 使用console.log代替this.log
+      // 处理错误，例如记录日志或抛出异常
-      throw error;
+      throw new Error(`物流订单处理失败: ${error}`);
+
     }
   }
 
@@ -822,11 +836,15 @@ export class LogisticsService {
         id: data.address_id,
       },
     })
-
     const address = shipments?.address;
+    let courierCompany: string = "";
+    if (data.courierCompany != "最优物流") {
+      courierCompany = data.courierCompany;
+    }
     // 转换为RateTryRequest格式
     const r = {
-      shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
+      //shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
+      shipCompany: courierCompany,
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {

src/service/order.service.ts

@@ -41,6 +41,7 @@ import * as os from 'os';
 import { UnifiedOrderDTO } from '../dto/site-api.dto';
 import { CustomerService } from './customer.service';
 import { ProductService } from './product.service';
+import { Site } from '../entity/site.entity';
 @Provide()
 export class OrderService {
 
@@ -628,7 +629,8 @@ export class OrderService {
       // 保存订单项
       await this.saveOrderItem(entity);
       // 为每个订单项创建对应的销售项(OrderSale)
-      await this.saveOrderSale(entity);
+      const site = await this.siteService.get(siteId);
+      await this.saveOrderSale(entity,site);
     }
   }
 
@@ -718,7 +720,7 @@ export class OrderService {
    */
   // TODO 这里存的是库存商品实际
   // 所以叫做 orderInventoryItems 可能更合适
-  async saveOrderSale(orderItem: OrderItem) {
+  async saveOrderSale(orderItem: OrderItem,site:Site) {
     const currentOrderSale = await this.orderSaleModel.find({
       where: {
         siteId: orderItem.siteId,
@@ -731,32 +733,24 @@ export class OrderService {
     if (!orderItem.sku) return;
 
     // 从数据库查询产品，关联查询组件
-    const productDetail = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name });
+    const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name },orderItem.quantity,site);
-
+    if(!componentDetails?.length){
-    if (!productDetail || !productDetail.quantity) return;
+      return 
-    const { product, quantity } = productDetail
-    const componentDetails: { product: Product, quantity: number }[] = product.components?.length > 0 ? await Promise.all(product.components.map(async comp => {
-      return {
-        product: await this.productModel.findOne({
-          where: { id: comp.productId },
-        }),
-        quantity: comp.quantity * orderItem.quantity,
     }
-    })) : [{ product, quantity }]
 
-    const orderSales: OrderSale[] = componentDetails.map(componentDetail => {
+    const orderSales: OrderSale[] = componentDetails.map(({product, parentProduct, quantity}) => {
-      if (!componentDetail.product) return null
+      if (!product) return null
       const attrsObj = this.productService.getAttributesObject(product.attributes)
       const orderSale = plainToClass(OrderSale, {
         orderId: orderItem.orderId,
         siteId: orderItem.siteId,
         externalOrderItemId: orderItem.externalOrderItemId,// 原始 itemId
-        parentProductId: product.id, // 父产品 ID 用于统计套餐 如果是单品则不记录
+        parentProductId: parentProduct.id, // 父产品 ID 用于统计套餐 如果是单品则不记录
-        productId: componentDetail.product.id,
+        productId: product.id,
         isPackage: product.type === 'bundle',// 这里是否是套餐取决于父产品
-        name: componentDetail.product.name,
+        name: product.name,
-        quantity: componentDetail.quantity * orderItem.quantity,
+        quantity: quantity * orderItem.quantity,
-        sku: componentDetail.product.sku,
+        sku: product.sku,
         // 理论上直接存 product 的全部数据才是对的，因为这样我的数据才全面。
         brand: attrsObj?.['brand']?.name,
         version: attrsObj?.['version']?.name,
@@ -764,7 +758,7 @@ export class OrderService {
         flavor: attrsObj?.['flavor']?.name,
         humidity: attrsObj?.['humidity']?.name,
         size: attrsObj?.['size']?.name,
-        category: componentDetail.product.category.name,
+        category: product.category.name,
       });
       return orderSale
     }).filter(v => v !== null)
@@ -2460,18 +2454,18 @@ export class OrderService {
    */
   // TODO 
   async exportOrder(ids: number[]) {
-    // 日期	订单号	姓名地址	邮箱	号码	订单内容	盒数	换盒数	换货内容	快递号
+    // 日期	订单号	姓名地址	邮箱	号码	盒数	换盒数	换货内容	快递号	商品1	数量1	商品2	数量2...
     interface ExportData {
       '日期': string;
       '订单号': string;
       '姓名地址': string;
       '邮箱': string;
       '号码': string;
-      '订单内容': string;
       '盒数': number;
       '换盒数': number;
       '换货内容': string;
       '快递号': string;
+      [key: string]: any; // 支持动态添加的商品和数量列
     }
 
     try {
@@ -2518,6 +2512,15 @@ export class OrderService {
           return acc;
         }, {} as Record<number, OrderItem[]>);
 
+        // 计算最大商品数量
+        let maxItemsCount = 0;
+        orders.forEach(order => {
+          const items = orderItemsByOrderId[order.id] || [];
+          if (items.length > maxItemsCount) {
+            maxItemsCount = items.length;
+          }
+        });
+
         // 构建导出数据
         const exportDataList: ExportData[] = orders.map(order => {
           // 获取订单的订单项
@@ -2526,9 +2529,6 @@ export class OrderService {
           // 计算总盒数
           const boxCount = items.reduce((total, item) => total + item.quantity, 0);
 
-          // 构建订单内容
-          const orderContent = items.map(item => `${item.name}  x ${item.quantity}`).join('; ');
-
           // 构建姓名地址
           const shipping = order.shipping;
           const billing = order.billing;
@@ -2553,18 +2553,32 @@ export class OrderService {
           const exchangeBoxCount = 0;
           const exchangeContent = '';
 
-          return {
+          // 构建基础数据对象
+          const baseData: ExportData = {
             '日期': order.date_created?.toISOString().split('T')[0] || '',
             '订单号': order.externalOrderId || '',
             '姓名地址': nameAddress,
             '邮箱': order.customer_email || '',
             '号码': phone,
-            '订单内容': orderContent,
             '盒数': boxCount,
             '换盒数': exchangeBoxCount,
             '换货内容': exchangeContent,
             '快递号': trackingNumber
           };
+
+          // 添加商品和数量列
+          items.forEach((item, index) => {
+            baseData[`商品${index + 1}`] = item.name;
+            baseData[`数量${index + 1}`] = item.quantity;
+          });
+
+          // 填充空值，确保所有行的列数一致
+          for (let i = items.length; i < maxItemsCount; i++) {
+            baseData[`商品${i + 1}`] = '';
+            baseData[`数量${i + 1}`] = '';
+          }
+
+          return baseData;
         });
 
         // 返回CSV字符串内容给前端

src/service/product.service.ts

@@ -34,6 +34,7 @@ import { paginate } from '../utils/paginate.util';
 import { SiteApiService } from './site-api.service';
 import { StockService } from './stock.service';
 import { TemplateService } from './template.service';
+import { Site } from '../entity/site.entity';
 
 @Provide()
 export class ProductService {
@@ -1784,51 +1785,31 @@ export class ProductService {
     // 这里判断 second 是否是数字
     return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last)
   }
-  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }) {
+  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }, quantity: number = 1, site: Site): Promise<{ product: Product,parentProduct?: Product, quantity: number }[]>  {
     if (!siteProduct.sku) {
       throw new Error('siteSku 不能为空')
     }
 
-    let product = await this.productModel.findOne({
+    const  product = await this.getProductBySiteSku(siteProduct.sku, site)
-      where: { siteSkus: Like(`%${siteProduct.sku}%`) },
+
-      relations: ['components', 'attributes', 'attributes.dict'],
+    if (!product) return
-    });
+
-    let quantity = 1;
+    if(!product?.components?.length){
-    // 这里处理一下特殊情况,就是无法直接通过 siteProduct.sku去获取， 但有一定规则转换成有的产品，就是 bundle 的部分
+      return [{
-    // 考察各个站点的 bundle 规则， 会发现
+        product,
-    // wordpress: 
+        quantity
-    // togovape YOONE Wintergreen 9MG (Moisture) - 10 cans TV-YOONE-NP-S-WG-9MG-0010   
+      }]
-    // togovape mixed 是这样的 TV-YOONE-NP-G-12MG-MX-0003 TV-ZEX-NP-Mixed-12MG-0001
-    // 
-    // shopyy: shopyy 已经
-    // 只有 bundle 做这个处理
-    if (!product && !this.isMixedSku(siteProduct.sku)) {
-      const skuSplitArr = siteProduct.sku.split('-')
-      const quantityStr = skuSplitArr[skuSplitArr.length - 1]
-      const isBundleSku = quantityStr.startsWith('0')
-      if(!isBundleSku){
-        return undefined
-      }
-      quantity = Number(quantityStr)
-      if(!isBundleSku){
-        return undefined
-      }
-      // 更正为正确的站点 sku
-      const childSku = skuSplitArr.slice(0, skuSplitArr.length - 1).join('-')
-      // 重新获取匹配的商品
-      product = await this.productModel.findOne({
-        where: { siteSkus: Like(`%${childSku}%`) },
-        relations: ['components', 'attributes', 'attributes.dict'],
-      });
     }
 
-    if (!product) {
+    return await Promise.all(product.components.map(async comp => {
-      throw new Error(`产品 ${siteProduct.sku} 不存在`);
-    }
       return {
-      product,
+        product: await this.productModel.findOne({
-      quantity,
+          where: { id: comp.productId },
+        }),
+        parentProduct: product, // 这里得记录一下他的爸爸用来记录
+        quantity: comp.quantity * quantity,
       }
+    })) 
   }
 
   // 准备创建产品的 DTO, 处理类型转换和默认值
@@ -2162,18 +2143,26 @@ export class ProductService {
   }
 
   // 根据站点SKU查询产品
-  async findProductBySiteSku(siteSku: string): Promise<Product> {
+  async getProductBySiteSku(siteSku: string, site?: Site): Promise<Product> {
-    const product = await this.productModel.findOne({
+    // 使用查询构建器来正确查询关联表
-      where: { siteSkus: Like(`%${siteSku}%`) },
+    const queryBuilder = this.productModel
-      relations: ['category', 'attributes', 'attributes.dict', 'components']
+      .createQueryBuilder('product')
-    });
+      .leftJoinAndSelect('product.category', 'category')
+      .leftJoinAndSelect('product.attributes', 'attributes')
+      .leftJoinAndSelect('attributes.dict', 'dict')
+      .leftJoinAndSelect('product.components', 'components')
+      .leftJoinAndSelect('product.siteSkus', 'siteSku')
+      .where('siteSku.sku LIKE :siteSku', { siteSku: `%${siteSku}%` })
+      .orWhere('product.sku = :siteSku', { siteSku });
 
-    if (!product) {
+    if (site) {
-      throw new Error(`站点SKU ${siteSku} 不存在`);
+      queryBuilder.orWhere('product.sku = :processedSku', {
+        processedSku: siteSku.replace(new RegExp(site.skuPrefix + '-'), '')
+      });
     }
 
-    // 获取完整的产品信息，包含所有关联数据
+    const product = await queryBuilder.getOne();
-    return this.getProductById(product.id);
+    return product
   }
 
   // 获取产品的站点SKU列表

src/service/site-api.service.ts

@@ -60,7 +60,7 @@ export class SiteApiService {
 
     try {
       // 使用站点SKU查询对应的ERP产品
-      const erpProduct = await this.productService.findProductBySiteSku(siteProduct.sku);
+      const erpProduct = await this.productService.getProductBySiteSku(siteProduct.sku);
 
       // 将ERP产品信息合并到站点商品中
       return {

src/service/site-product.service.ts

@@ -0,0 +1,102 @@
+import { Inject, Provide } from '@midwayjs/core';
+import { ILogger } from '@midwayjs/logger';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
+import { SiteProduct } from '../entity/site-product.entity';
+
+@Provide()
+export class SiteProductService {
+  @InjectEntityModel(SiteProduct)
+  siteProductModel: Repository<SiteProduct>;
+
+  @Inject()
+  logger: ILogger;
+
+  async getSiteProductList(params: {
+    current?: number;
+    pageSize?: number;
+    siteId?: number;
+    name?: string;
+    sku?: string;
+  }) {
+    const {
+      current = 1,
+      pageSize = 10,
+      siteId,
+      name,
+      sku,
+    } = params;
+
+    const queryBuilder = this.siteProductModel.createQueryBuilder('siteProduct');
+
+    // 根据 siteId 筛选
+    if (siteId) {
+      queryBuilder.where('siteProduct.siteId = :siteId', { siteId });
+    }
+
+    // 根据 name 或 sku 模糊搜索
+    if (name || sku) {
+      queryBuilder.andWhere(
+        '(siteProduct.name LIKE :keyword OR siteProduct.sku LIKE :keyword)',
+        { keyword: `%${name || sku}%` }
+      );
+    }
+
+    // 计算总数
+    const total = await queryBuilder.getCount();
+
+    // 分页查询
+    const items = await queryBuilder
+      .skip((current - 1) * pageSize)
+      .take(pageSize)
+      .orderBy('siteProduct.updatedAt', 'DESC')
+      .getMany();
+
+    return {
+      total,
+      items,
+      current,
+      pageSize,
+    };
+  }
+
+  async getSiteProductById(id: string) {
+    return await this.siteProductModel.findOne({ where: { id } });
+  }
+
+  async createSiteProduct(data: Partial<SiteProduct>) {
+    const siteProduct = this.siteProductModel.create(data);
+    return await this.siteProductModel.save(siteProduct);
+  }
+
+  async updateSiteProduct(id: string, data: Partial<SiteProduct>) {
+    await this.siteProductModel.update(id, data);
+    return await this.getSiteProductById(id);
+  }
+
+  async deleteSiteProduct(id: string) {
+    await this.siteProductModel.delete(id);
+    return true;
+  }
+
+  async batchUpdatePrice(siteId: number, productIds: string[], price: number) {
+    const result = await this.siteProductModel
+      .createQueryBuilder()
+      .update()
+      .set({ price })
+      .where('siteId = :siteId AND id IN (:...productIds)', { siteId, productIds })
+      .execute();
+
+    return result.affected || 0;
+  }
+
+  async syncSiteProducts(siteId: number) {
+    // 这里实现同步逻辑，暂时返回成功
+    // 实际实现时需要调用对应的站点适配器进行同步
+    this.logger.info(`Syncing products for site ${siteId}`);
+    return {
+      success: true,
+      message: '同步成功',
+    };
+  }
+}