v3.5.4版本提交

server/dukang-api/src/modules/fulfillment/fulfillment.service.ts

@@ -76,11 +76,12 @@ export class FulfillmentService {
         return;
       }
 
-      // 大单拦截：≥10 箱不自动推小飞侠，待总部确认后推单或自配送
-      if (shouldHoldAutoCourierDispatch(order.quantity)) {
-        const boxes = calcOrderBoxCount(order.quantity);
+      // 大单拦截：≥10 箱不自动推小飞侠，待总部确认后推单或自配送（按瓶当量）
+      const bottleQty = order.quantity * (order.bottlesPerUnit > 0 ? order.bottlesPerUnit : 1);
+      if (shouldHoldAutoCourierDispatch(bottleQty)) {
+        const boxes = calcOrderBoxCount(bottleQty);
         this.logger.warn(
-          `大单拦截自动推单：${order.orderNo} quantity=${order.quantity} bottles≈${boxes}箱（阈值 ${XFX_AUTO_DISPATCH_MAX_BOXES}箱/${BOTTLES_PER_BOX}瓶）`,
+          `大单拦截自动推单：${order.orderNo} quantity=${order.quantity}×${order.bottlesPerUnit} bottles≈${boxes}箱（阈值 ${XFX_AUTO_DISPATCH_MAX_BOXES}箱/${BOTTLES_PER_BOX}瓶）`,
         );
         await this.prisma.order.update({
           where: { id: orderId },
@@ -97,7 +98,7 @@ export class FulfillmentService {
             refType: 'ORDER',
             refId: order.id,
             status: 'PENDING',
-            errorMessage: `大单拦截：${order.quantity}瓶(约${boxes}箱)，需总部确认后推小飞侠或自配送`.slice(
+            errorMessage: `大单拦截：${bottleQty}瓶(约${boxes}箱)，需总部确认后推小飞侠或自配送`.slice(
               0,
               512,
             ),
@@ -155,7 +156,7 @@ export class FulfillmentService {
             addressDetail: order.receiverAddress,
           },
           goodsName: order.productName,
-          goodsNum: order.quantity,
+          goodsNum: order.quantity * (order.bottlesPerUnit > 0 ? order.bottlesPerUnit : 1),
           weight: 2,
           payMode: CourierPayMode.SENDER,
           remark: `仓配自动发货 ${order.orderNo}`,