fix(service): 修改客户服务中的默认排序顺序

将默认排序从 orders ASC 改为 orders DESC 以符合业务需求

src/config/config.default.ts

@@ -42,6 +42,7 @@ import DictSeeder from '../db/seeds/dict.seeder';
 import CategorySeeder from '../db/seeds/category.seeder';
 import CategoryAttributeSeeder from '../db/seeds/category_attribute.seeder';
 import { SiteSku } from '../entity/site-sku.entity';
+import { logisticsAlias } from '../entity/logistics_alias.entity';
 
 export default {
   // use for cookie sign key, should change to your own and keep security
@@ -88,6 +89,7 @@ export default {
         Area,
         CategoryAttribute,
         Category,
+        logisticsAlias,
       ],
       synchronize: true,
       logging: false,

src/dto/logistics.dto.ts

@@ -25,7 +25,7 @@ export class ShipmentBookDTO {
   shipmentPlatform: string;
 
   @ApiProperty()
-  @Rule(RuleType.string())
+  @Rule(RuleType.any())
   courierCompany: string;
 }
 

src/entity/logistics_alias.entity.ts

@@ -0,0 +1,34 @@
+
+import { ApiProperty } from '@midwayjs/swagger';
+import { Entity, CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn, Column } from 'typeorm';
+
+@Entity('logistics_alias')
+export class logisticsAlias {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @ApiProperty({ type: 'string' })
+  @Column()
+  logistics_company: string
+
+  @ApiProperty({ type: 'string' })
+  @Column()
+  logistics_alias: string
+
+  @ApiProperty({ type: 'string' })
+  @Column()
+  platform: string
+
+
+  // 是否可删除
+  @Column({ default: true, comment: '是否可删除' })
+  deletable: boolean;
+  // 创建时间
+  @CreateDateColumn()
+  createdAt: Date;
+
+  // 更新时间
+  @UpdateDateColumn()
+  updatedAt: Date;
+
+}

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/customer.service.ts

@@ -283,7 +283,7 @@ export class CustomerService {
         orderByClause = `ORDER BY ${orderClauses.join(', ')}`;
       }
     } else {
-      orderByClause = 'ORDER BY orders ASC, yoone_total DESC';
+      orderByClause = 'ORDER BY orders DESC, yoone_total DESC';
     }
 
     // 主查询

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;
-          unique_id = resShipmentOrder.data?.shipOrderId;
+          co = resShipmentOrder.shipOrderId;
+          unique_id = resShipmentOrder.shipOrderId;
           state = ErpOrderStatus.COMPLETED;
         }
 
@@ -728,14 +726,20 @@ 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') {
+
         // 根据TMS系统对接说明文档格式化参数
         const reqBody: any = {
           // shipCompany: 'UPSYYZ7000NEW',
-          shipCompany: data.courierCompany || "",
-          partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
+          shipCompany: data.courierCompany,
+          partnerOrderNumber: order.siteId + '-' + order.externalOrderId,
           warehouseId: '25072621030107400060',
           shipper: {
             name: data.details.origin.contact_name, // 姓名
@@ -833,7 +837,7 @@ export class LogisticsService {
     // 转换为RateTryRequest格式
     const r = {
       //shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
-      shipCompany: data.courierCompany || "",
+      shipCompany: data.courierCompany,
       partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
       warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
       shipper: {

src/service/order.service.ts

@@ -42,6 +42,7 @@ import { UnifiedOrderDTO } from '../dto/site-api.dto';
 import { CustomerService } from './customer.service';
 import { ProductService } from './product.service';
 import { Site } from '../entity/site.entity';
+import { logisticsAlias } from '../entity/logistics_alias.entity';
 @Provide()
 export class OrderService {
 
@@ -54,6 +55,9 @@ export class OrderService {
   @InjectEntityModel(Order)
   orderModel: Repository<Order>;
 
+  @InjectEntityModel(logisticsAlias)
+  logisticsAliasModel: Repository<logisticsAlias>;
+
   @InjectEntityModel(User)
   userModel: Repository<User>;
 
@@ -630,7 +634,7 @@ export class OrderService {
       await this.saveOrderItem(entity);
       // 为每个订单项创建对应的销售项(OrderSale)
       const site = await this.siteService.get(siteId);
-      await this.saveOrderSale(entity,site);
+      await this.saveOrderSale(entity, site);
     }
   }
 
@@ -720,7 +724,7 @@ export class OrderService {
    */
   // TODO 这里存的是库存商品实际
   // 所以叫做 orderInventoryItems 可能更合适
-  async saveOrderSale(orderItem: OrderItem,site:Site) {
+  async saveOrderSale(orderItem: OrderItem, site: Site) {
     const currentOrderSale = await this.orderSaleModel.find({
       where: {
         siteId: orderItem.siteId,
@@ -733,14 +737,13 @@ export class OrderService {
     if (!orderItem.sku) return;
 
     // 从数据库查询产品，关联查询组件
-    const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, site);
-    if(!componentDetails?.length){
+    const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, orderItem.quantity, site);
+    if (!componentDetails?.length) {
       return
     }
 
-    const orderSales: OrderSale[] = componentDetails.map(({product, parentProduct, quantity}) => {
+    const orderSales: OrderSale[] = componentDetails.map(({ product, parentProduct, quantity }) => {
       if (!product) return null
-      console.log('product',product)
       const attrsObj = this.productService.getAttributesObject(product.attributes)
       const orderSale = plainToClass(OrderSale, {
         orderId: orderItem.orderId,
@@ -2455,18 +2458,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 {
@@ -2513,6 +2516,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 => {
           // 获取订单的订单项
@@ -2521,9 +2533,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;
@@ -2548,18 +2557,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字符串内容给前端
@@ -2847,6 +2870,11 @@ export class OrderService {
       chargeback: headers.indexOf('拒付')
     };
 
+    const logisticsAliases = await this.logisticsAliasModel.find();
+
+    // 构建物流公司别名映射
+    const logisticsAliasMap = new Map(logisticsAliases.map(alias => [alias.logistics_alias, alias.logistics_company]));
+
     // 遍历数据行
     for (let i = 0; i < dataRows.length; i++) {
       const row = dataRows[i];
@@ -2858,9 +2886,11 @@ export class OrderService {
       }
 
       try {
-            let orderNumbers="";
-            if (orderNumber.includes('_')&&orderNumber.includes('-')) {
-            orderNumbers = orderNumber.split('_')[0].toString();
+        let orderNumbers = orderNumber;
+        // 确保 orderNumber 是字符串类型
+        const orderNumberStr = String(orderNumber);
+        if (orderNumberStr.includes('_') && orderNumberStr.includes('-')) {
+          orderNumbers = orderNumberStr.split('_')[0].toString();
           orderNumbers = orderNumbers.split('-')[1];
         }
         // 通过订单号查询订单
@@ -2871,9 +2901,11 @@ export class OrderService {
 
           if (fulfillments && fulfillments.length > 0) {
             const fulfillment = fulfillments[0]; // 假设每个订单只有一个物流信息 
+
+            const shipping_provider = logisticsAliasMap.get(fulfillment.shipping_provider);
             // 回填物流信息
             if (columnIndices.logisticsCompany !== -1) {
-                   row[columnIndices.logisticsCompany] = fulfillment.shipping_provider || '';
+              row[columnIndices.logisticsCompany] = shipping_provider || '';
             }
             if (columnIndices.trackingNumber !== -1) {
               row[columnIndices.trackingNumber] = fulfillment.tracking_number || '';

src/service/product.service.ts

@@ -1785,8 +1785,14 @@ export class ProductService {
       attributes: attributes.length > 0 ? attributes : undefined,
     }
   }
-  // 获取库存单品列表
-  async getComponentDetailFromSiteSku(siteProduct: { sku: string, name?: string }, site: Site): Promise<{ product: Product,parentProduct?: Product, quantity: number }[]>  {
+  isMixedSku(sku: string) {
+    const splitSKu = sku.split('-')
+    const last = splitSKu[splitSKu.length - 1]
+    const second = splitSKu[splitSKu.length - 2]
+    // 这里判断 second 是否是数字
+    return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last)
+  }
+  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 不能为空')
     }
@@ -1795,21 +1801,20 @@ export class ProductService {
 
     if (!product) return
 
-    if(!product?.components?.length){
+    if (!product?.components?.length) {
       return [{
         product,
-        quantity:1
+        quantity
       }]
     }
 
     return await Promise.all(product.components.map(async comp => {
       return {
         product: await this.productModel.findOne({
-          where: { sku: comp.sku },
-          relations: ['category', 'attributes', 'attributes.dict', 'components']
+          where: { id: comp.productId },
         }),
         parentProduct: product, // 这里得记录一下他的爸爸用来记录
-        quantity: comp.quantity,
+        quantity: comp.quantity * quantity,
       }
     }))
   }
@@ -2150,7 +2155,7 @@ export class ProductService {
       .leftJoinAndSelect('product.components', 'components')
       .leftJoinAndSelect('product.siteSkus', 'siteSku')
       .where('siteSku.sku LIKE :siteSku', { siteSku: `%${siteSku}%` })
-      .orWhere('product.sku = :siteSku', { siteSku })
+      .orWhere('product.sku = :siteSku', { siteSku });
 
     if (site) {
       queryBuilder.orWhere('product.sku = :processedSku', {

src/service/wp.service.ts

@@ -75,7 +75,7 @@ export class WPService implements IPlatformService {
     }
     const data = res.data as T[];
     const totalPages = Number(res.headers?.['x-wp-totalpages'] ?? 1);
-    const total = Number(res.headers?.['x-wp-total']?? 1)
+    const total = Number(res.headers?.['x-wp-total'] ?? 1)
     return { items: data, total, totalPages, page, per_page, page_size: per_page };
   }
 
@@ -206,7 +206,7 @@ export class WPService implements IPlatformService {
     const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
       'base64'
     );
-    console.log(`!!!wpApiUrl, consumerKey, consumerSecret, auth`,site.apiUrl, consumerKey, consumerSecret, auth)
+    console.log(`!!!wpApiUrl, consumerKey, consumerSecret, auth`, site.apiUrl, consumerKey, consumerSecret, auth)
     let hasMore = true;
     while (hasMore) {
       const config: AxiosRequestConfig = {
@@ -259,8 +259,8 @@ export class WPService implements IPlatformService {
   // 导出 WooCommerce 产品为特殊CSV(平台特性)
   async exportProductsCsvSpecial(site: any, page: number = 1, pageSize: number = 100): Promise<string> {
     const list = await this.getProducts(site, { page, per_page: pageSize });
-    const header = ['id','name','type','status','sku','regular_price','sale_price','stock_status','stock_quantity'];
-    const rows = (list.items || []).map((p: any) => [p.id,p.name,p.type,p.status,p.sku,p.regular_price,p.sale_price,p.stock_status,p.stock_quantity]);
+    const header = ['id', 'name', 'type', 'status', 'sku', 'regular_price', 'sale_price', 'stock_status', 'stock_quantity'];
+    const rows = (list.items || []).map((p: any) => [p.id, p.name, p.type, p.status, p.sku, p.regular_price, p.sale_price, p.stock_status, p.stock_quantity]);
     const csv = [header.join(','), ...rows.map(r => r.map(v => String(v ?? '')).join(','))].join('\n');
     return csv;
   }
@@ -289,7 +289,7 @@ export class WPService implements IPlatformService {
     const res = await api.get(`orders/${orderId}`);
     return res.data as Record<string, any>;
   }
-  async getOrders(siteId: number,params: Record<string, any> = {}): Promise<Record<string, any>[]> {
+  async getOrders(siteId: number, params: Record<string, any> = {}): Promise<Record<string, any>[]> {
     const site = await this.siteService.get(siteId);
     const api = this.createApi(site, 'wc/v3');
     return await this.sdkGetAll<Record<string, any>>(api, 'orders', params);
@@ -805,7 +805,7 @@ export class WPService implements IPlatformService {
       const result = response.data;
 
       // 转换 WooCommerce 批量操作结果为统一格式
-      const errors: Array<{identifier: string, error: string}> = [];
+      const errors: Array<{ identifier: string, error: string }> = [];
 
       // WooCommerce 返回格式: { create: [...], update: [...], delete: [...] }
       // 错误信息可能在每个项目的 error 字段中
@@ -1046,7 +1046,7 @@ export class WPService implements IPlatformService {
     };
   }
 
-public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> = {}) {
+  public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> = {}) {
     const apiUrl = site.apiUrl;
     const { consumerKey, consumerSecret } = site as any;
     const endpoint = 'wp/v2/media';
@@ -1061,15 +1061,15 @@ public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> =
       }
     });
     // 检查是否有错误信息
-    if(response?.data?.message){
+    if (response?.data?.message) {
       throw new Error(`获取${apiUrl}条媒体文件失败,原因为${response.data.message}`)
     }
-    if(!Array.isArray(response.data)) {
+    if (!Array.isArray(response.data)) {
       throw new Error(`获取${apiUrl}条媒体文件失败,原因为返回数据不是数组`);
     }
     const total = Number(response.headers['x-wp-total'] || 0);
     const totalPages = Number(response.headers['x-wp-totalpages'] || 0);
-    return { items: response.data, total, totalPages, page:params.page ?? 1, per_page: params.per_page ?? 20, page_size: params.per_page ?? 20 };
+    return { items: response.data, total, totalPages, page: params.page ?? 1, per_page: params.per_page ?? 20, page_size: params.per_page ?? 20 };
   }
   /**
    * 上传媒体文件
@@ -1205,10 +1205,12 @@ public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> =
           throw new Error('source_url 不存在');
         }
         // 下载源文件为 Buffer
-        const resp = await axios.get(srcUrl, { responseType: 'arraybuffer',    timeout: 30000,
+        const resp = await axios.get(srcUrl, {
+          responseType: 'arraybuffer', timeout: 30000,
           headers: {
             'User-Agent': 'Mozilla/5.0 (compatible; Node.js Axios)',
-    } });
+          }
+        });
         const inputBuffer = Buffer.from(resp.data);
         // 条件判断 如果下载的 Buffer 为空则抛出错误
         if (!inputBuffer || inputBuffer.length === 0) {