@pisell/pisellos 0.10.14 → 0.10.16

package/dist/modules/Order/types.d.ts

@@ -189,6 +189,8 @@ export interface OrderLocalizedText {
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
+    /** Product 或当前 Variant 的生产编码 */
+    production_code?: string;
     bundle_edit?: number;
     product_sku: OrderProductSku;
     gift_card?: number;
@@ -332,6 +334,8 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 跳过同商品/规格匹配，始终新增购物车行。 */
+    disableMerge?: boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
@@ -827,7 +831,7 @@ export interface OrderModuleAPI {
     saveDraft: () => Promise<void>;
     hydrateTempOrderFromRecord: (record: Record<string, any>, options?: {
         recalcOnHydrate?: boolean;
-        source?: 'salesDetail' | 'sessionStorage';
+        source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
     }) => Promise<OrderTempOrder>;
     syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
     getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;

package/dist/modules/Order/utils/virtualSettlement.d.ts

@@ -12,6 +12,12 @@ export interface LegalCurrencySnapshot {
     currency_symbol: string;
     currency_format: string;
 }
+export interface CurrencyDisplaySnapshot {
+    amount_format: string;
+    symbol: unknown;
+    unit_label: unknown;
+}
+export declare function buildCurrencyDisplaySnapshot(snapshot: Pick<SelectedSettlementSnapshot, 'amount_format' | 'symbol' | 'unit_label'>): CurrencyDisplaySnapshot;
 export declare function resolveSettlementDisplayValue(value: unknown): string;
 export declare class OrderSettlementConflictError extends Error {
     readonly currentSettlementKey: string;
@@ -43,7 +49,8 @@ export declare function isVirtualSettlementOrder(tempOrder: OrderTempOrder | nul
 export declare function isVirtualSettlementDisplayOrder(tempOrder: OrderTempOrder | null | undefined): boolean;
 /**
  * 将购物车锁定的结算单位提升为订单级状态。
- * 商品行快照只负责价格归一化；展示与提交统一读取 tempOrder.currency_*。
+ * 商品行快照同时负责价格归一化和生成订单级多语言展示快照；
+ * 交易中的即时展示仍统一读取 tempOrder.currency_*。
  */
 export declare function applyTempOrderSettlementState(tempOrder: OrderTempOrder, snapshot: SelectedSettlementSnapshot): void;
 /** 清空购物车结算锁，并恢复进入虚拟币结算前的店铺法币。 */

package/dist/modules/Order/utils/virtualSettlement.js

@@ -18,6 +18,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import Decimal from 'decimal.js';
+import { cloneDeep } from 'lodash-es';
+export function buildCurrencyDisplaySnapshot(snapshot) {
+  var _snapshot$symbol, _snapshot$unit_label;
+  return cloneDeep({
+    amount_format: String(snapshot.amount_format || '').trim(),
+    symbol: (_snapshot$symbol = snapshot.symbol) !== null && _snapshot$symbol !== void 0 ? _snapshot$symbol : {},
+    unit_label: (_snapshot$unit_label = snapshot.unit_label) !== null && _snapshot$unit_label !== void 0 ? _snapshot$unit_label : {}
+  });
+}
 export function resolveSettlementDisplayValue(value) {
   var _ref, _ref2, _ref3, _ref4, _ref5, _localized$auto;
   if (value === undefined || value === null) return '';
@@ -140,17 +149,21 @@ function captureLegalCurrencySnapshot(tempOrder) {
 
 /**
  * 将购物车锁定的结算单位提升为订单级状态。
- * 商品行快照只负责价格归一化；展示与提交统一读取 tempOrder.currency_*。
+ * 商品行快照同时负责价格归一化和生成订单级多语言展示快照；
+ * 交易中的即时展示仍统一读取 tempOrder.currency_*。
  */
 export function applyTempOrderSettlementState(tempOrder, snapshot) {
   tempOrder.metadata = tempOrder.metadata || {};
   var settlementKey = getSettlementKey(snapshot) || 'legal_currency';
   if (snapshot.settlement_type === 'virtual_currency') {
+    var _tempOrder$metadata$c;
     captureLegalCurrencySnapshot(tempOrder);
     var _currencyProductId = Number(snapshot.currency_product_id);
+    var existingDisplaySnapshot = (_tempOrder$metadata$c = tempOrder.metadata.currency_settlement_config) === null || _tempOrder$metadata$c === void 0 ? void 0 : _tempOrder$metadata$c.currency_display_snapshot;
     tempOrder.metadata.currency_settlement_config = {
       settlement_type: 'virtual_currency',
-      settlement_ids: Number.isFinite(_currencyProductId) && _currencyProductId > 0 ? [_currencyProductId] : []
+      settlement_ids: Number.isFinite(_currencyProductId) && _currencyProductId > 0 ? [_currencyProductId] : [],
+      currency_display_snapshot: existingDisplaySnapshot ? cloneDeep(existingDisplaySnapshot) : buildCurrencyDisplaySnapshot(snapshot)
     };
   } else {
     delete tempOrder.metadata.currency_settlement_config;

package/dist/modules/Order/utils.js

@@ -873,6 +873,7 @@ function formatSubmitBundleItems(bundle) {
     return {
       is_charge_tax: formatOptions.virtualSettlementMode ? 0 : (_rawBundle$is_charge_ = rawBundle.is_charge_tax) !== null && _rawBundle$is_charge_ !== void 0 ? _rawBundle$is_charge_ : 0,
       bundle_variant_id: (_rawBundle$bundle_var = rawBundle.bundle_variant_id) !== null && _rawBundle$bundle_var !== void 0 ? _rawBundle$bundle_var : 0,
+      production_code: rawBundle.production_code,
       num: num,
       quantity: toBundleNumber((_rawBundle$quantity = rawBundle.quantity) !== null && _rawBundle$quantity !== void 0 ? _rawBundle$quantity : rawBundle.num, num),
       extension_id: (_rawBundle$extension_ = rawBundle.extension_id) !== null && _rawBundle$extension_ !== void 0 ? _rawBundle$extension_ : 0,
@@ -1155,7 +1156,12 @@ export function buildSubmitPayload(params) {
     var _tempOrder$bookings;
     // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
     if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
-      submitType = 'appointment_booking';
+      // 260807 如果 biz 是堂食，type 使用table-order
+      if (businessCode === 'dine_in') {
+        submitType = 'table-order';
+      } else {
+        submitType = 'appointment_booking';
+      }
     } else {
       submitType = 'virtual';
     }

package/dist/modules/Payment/index.js

@@ -207,9 +207,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // // 预连接数据库
               // this.dbManager.connect()
 
-              console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 16:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -341,7 +340,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                console.log('网络状态:', status.connected);
                 _this3.logInfo('Network status changed', {
                   connected: status.connected,
                   previousStatus: status.previousStatus
@@ -350,7 +348,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                   _this3.logInfo('Network reconnected');
                   // 网络恢复时的处理逻辑可以在这里添加
                 }
-              case 3:
+              case 2:
               case "end":
                 return _context2.stop();
             }
@@ -627,7 +625,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               order = _context7.sent;
               if (!order) {
-                _context7.next = 10;
+                _context7.next = 9;
                 break;
               }
               _context7.next = 7;
@@ -636,20 +634,18 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               _context7.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onOrderDeleted"), order);
             case 9:
-              console.log('[PaymentModule] 支付订单删除成功:', orderUuid);
-            case 10:
-              _context7.next = 16;
+              _context7.next = 15;
               break;
-            case 12:
-              _context7.prev = 12;
+            case 11:
+              _context7.prev = 11;
               _context7.t0 = _context7["catch"](0);
               console.error('[PaymentModule] 删除支付订单失败', _context7.t0);
               throw _context7.t0;
-            case 16:
+            case 15:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 12]]);
+        }, _callee7, this, [[0, 11]]);
       }));
       function deletePaymentOrderAsync(_x6) {
         return _deletePaymentOrderAsync.apply(this, arguments);
@@ -799,10 +795,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 originalOrderId: originalOrderId,
                 newOrderId: newOrderId
               });
-              console.log("[PaymentModule] \u8BA2\u5355ID\u66FF\u6362\u6210\u529F: ".concat(originalOrderId, " \u2192 ").concat(newOrderId));
               return _context9.abrupt("return", updatedOrder);
-            case 28:
-              _context9.prev = 28;
+            case 27:
+              _context9.prev = 27;
               _context9.t0 = _context9["catch"](1);
               console.error('[PaymentModule] 替换订单ID失败', _context9.t0);
               this.logError('replaceOrderIdByUuidAsync failed', _context9.t0, {
@@ -810,11 +805,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 newOrderId: newOrderId
               });
               throw _context9.t0;
-            case 33:
+            case 32:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[1, 28]]);
+        }, _callee9, this, [[1, 27]]);
       }));
       function replaceOrderIdByUuidAsync(_x9, _x10) {
         return _replaceOrderIdByUuidAsync.apply(this, arguments);
@@ -1105,42 +1100,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               paymentItem.origin_amount = paymentItem.amount; // 保存原始金额
               paymentItem.amount = '0.00'; // 将金额设为0，不参与订单金额计算
 
-              console.log("[PaymentModule] \u652F\u4ED8\u9879\u6807\u8BB0\u4E3A\u5220\u9664:", {
-                uuid: paymentItem.uuid,
-                originalAmount: paymentItem.origin_amount,
-                status: paymentItem.status
-              });
-
               // 重新计算待付金额
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context13.next = 20;
+              _context13.next = 19;
               return this.dbManager.update('order', order);
-            case 20:
-              _context13.next = 22;
+            case 19:
+              _context13.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onPaymentDeleted"), {
                 order: order,
                 paymentItem: paymentItem
               });
-            case 22:
-              _context13.next = 24;
+            case 21:
+              _context13.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_delete',
                 order: order,
                 paymentItem: paymentItem
               });
-            case 24:
+            case 23:
               this.logInfo('deletePaymentAsync completed successfully (marked as voided)', {
                 orderUuid: orderUuid,
                 paymentUuid: paymentUuid,
                 originalAmount: paymentItem.origin_amount,
                 newExpectAmount: order.expect_amount
               });
-              _context13.next = 32;
+              _context13.next = 31;
               break;
-            case 27:
-              _context13.prev = 27;
+            case 26:
+              _context13.prev = 26;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 删除支付项失败', _context13.t0);
               this.logError('deletePaymentAsync failed', _context13.t0, {
@@ -1148,11 +1137,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentUuid: paymentUuid
               });
               throw _context13.t0;
-            case 32:
+            case 31:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 27]]);
+        }, _callee13, this, [[1, 26]]);
       }));
       function deletePaymentAsync(_x15, _x16) {
         return _deletePaymentAsync.apply(this, arguments);
@@ -1216,80 +1205,61 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       existingVoucherItems = order.payment.filter(function (payment) {
                         return payment.voucher_id && payment.status !== 'voided' && !payment.isSynced;
                       });
-                      console.log('[PaymentModule] 发现现有代金券支付项:', {
-                        orderUuid: orderUuid,
-                        existingVoucherCount: existingVoucherItems.length,
-                        existingItems: existingVoucherItems.map(function (item) {
-                          return {
-                            uuid: item.uuid,
-                            code: item.code,
-                            amount: item.amount,
-                            voucher_id: item.voucher_id,
-                            isSynced: item.isSynced
-                          };
-                        })
-                      });
-
                       // 2. 删除所有现有的代金券支付项（仅删除未同步的）
                       _iterator2 = _createForOfIteratorHelper(existingVoucherItems);
-                      _context14.prev = 12;
+                      _context14.prev = 11;
                       _iterator2.s();
-                    case 14:
+                    case 13:
                       if ((_step2 = _iterator2.n()).done) {
-                        _context14.next = 21;
+                        _context14.next = 19;
                         break;
                       }
                       voucherItem = _step2.value;
-                      console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
-                      _context14.next = 19;
+                      _context14.next = 17;
                       return _this6.deletePaymentAsync(orderUuid, voucherItem.uuid);
+                    case 17:
+                      _context14.next = 13;
+                      break;
                     case 19:
-                      _context14.next = 14;
+                      _context14.next = 24;
                       break;
                     case 21:
-                      _context14.next = 26;
-                      break;
-                    case 23:
-                      _context14.prev = 23;
-                      _context14.t0 = _context14["catch"](12);
+                      _context14.prev = 21;
+                      _context14.t0 = _context14["catch"](11);
                       _iterator2.e(_context14.t0);
-                    case 26:
-                      _context14.prev = 26;
+                    case 24:
+                      _context14.prev = 24;
                       _iterator2.f();
-                      return _context14.finish(26);
-                    case 29:
-                      _context14.next = 31;
+                      return _context14.finish(24);
+                    case 27:
+                      _context14.next = 29;
                       return _this6.getPaymentOrderByUuidAsync(orderUuid);
-                    case 31:
+                    case 29:
                       orderAfterDelete = _context14.sent;
                       if (orderAfterDelete) {
-                        _context14.next = 34;
+                        _context14.next = 32;
                         break;
                       }
                       throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
-                    case 34:
+                    case 32:
                       existingActiveVoucherKeys = new Set(orderAfterDelete.payment.filter(function (p) {
                         return p.voucher_id && p.status !== 'voided' && !p.isSynced;
                       }).map(function (p) {
                         return "".concat(p.voucher_id, "|").concat(p.order_payment_type || 'normal');
                       }));
-                      console.log('[PaymentModule] 添加新的代金券支付项:', {
-                        orderUuid: orderUuid,
-                        newItemCount: normalizedVoucherItems.length
-                      });
                       _iterator3 = _createForOfIteratorHelper(normalizedVoucherItems);
-                      _context14.prev = 37;
+                      _context14.prev = 34;
                       _iterator3.s();
-                    case 39:
+                    case 36:
                       if ((_step3 = _iterator3.n()).done) {
-                        _context14.next = 52;
+                        _context14.next = 48;
                         break;
                       }
                       _voucherItem = _step3.value;
                       orderPaymentType = _voucherItem.order_payment_type || 'normal';
                       key = "".concat(_voucherItem.voucher_id, "|").concat(orderPaymentType);
                       if (!existingActiveVoucherKeys.has(key)) {
-                        _context14.next = 46;
+                        _context14.next = 43;
                         break;
                       }
                       console.warn('[PaymentModule] Skip adding voucher payment item because it already exists (active)', {
@@ -1297,54 +1267,48 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                         voucher_id: _voucherItem.voucher_id,
                         order_payment_type: orderPaymentType
                       });
-                      return _context14.abrupt("continue", 50);
-                    case 46:
-                      console.log("[PaymentModule] \u6DFB\u52A0\u4EE3\u91D1\u5238\u652F\u4ED8\u9879:", _objectSpread(_objectSpread({}, _voucherItem), {}, {
-                        code: _voucherItem.code,
-                        amount: _voucherItem.amount,
-                        voucher_id: _voucherItem.voucher_id,
-                        order_payment_type: orderPaymentType
-                      }));
-                      _context14.next = 49;
+                      return _context14.abrupt("continue", 46);
+                    case 43:
+                      _context14.next = 45;
                       return _this6.addPaymentItemAsync(orderUuid, _voucherItem);
-                    case 49:
+                    case 45:
                       existingActiveVoucherKeys.add(key);
-                    case 50:
-                      _context14.next = 39;
+                    case 46:
+                      _context14.next = 36;
                       break;
-                    case 52:
-                      _context14.next = 57;
+                    case 48:
+                      _context14.next = 53;
                       break;
-                    case 54:
-                      _context14.prev = 54;
-                      _context14.t1 = _context14["catch"](37);
+                    case 50:
+                      _context14.prev = 50;
+                      _context14.t1 = _context14["catch"](34);
                       _iterator3.e(_context14.t1);
-                    case 57:
-                      _context14.prev = 57;
+                    case 53:
+                      _context14.prev = 53;
                       _iterator3.f();
-                      return _context14.finish(57);
-                    case 60:
-                      _context14.next = 62;
+                      return _context14.finish(53);
+                    case 56:
+                      _context14.next = 58;
                       return _this6.getPaymentOrderByUuidAsync(orderUuid);
-                    case 62:
+                    case 58:
                       updatedOrder = _context14.sent;
-                      _context14.next = 65;
+                      _context14.next = 61;
                       return _this6.core.effects.emit("".concat(_this6.name, ":onPaymentAdded"), {
                         orderUuid: orderUuid,
                         order: updatedOrder,
                         payment: null // 批量操作不提供单个支付项
                       });
-                    case 65:
+                    case 61:
                       _this6.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                         orderUuid: orderUuid,
                         removedVoucherCount: existingVoucherItems.length,
                         addedVoucherCount: normalizedVoucherItems.length,
                         finalExpectAmount: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.expect_amount
                       });
-                      _context14.next = 73;
+                      _context14.next = 69;
                       break;
-                    case 68:
-                      _context14.prev = 68;
+                    case 64:
+                      _context14.prev = 64;
                       _context14.t2 = _context14["catch"](3);
                       console.error('[PaymentModule] 批量更新代金券支付项失败:', _context14.t2);
                       _this6.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
@@ -1352,11 +1316,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                         voucherPaymentItems: voucherPaymentItems
                       });
                       throw _context14.t2;
-                    case 73:
+                    case 69:
                     case "end":
                       return _context14.stop();
                   }
-                }, _callee14, null, [[3, 68], [12, 23, 26, 29], [37, 54, 57, 60]]);
+                }, _callee14, null, [[3, 64], [11, 21, 24, 27], [34, 50, 53, 56]]);
               }))));
             case 1:
             case "end":
@@ -1577,11 +1541,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               if (totalPaidAmount.gte(orderTotalAmount)) {
                 // 支付金额足够，标记为已完成
                 order.payment_status = PaymentStatus.Finished;
-                console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5B8C\u6210\uFF0C\u91D1\u989D: ").concat(totalPaidAmount.toString(), "/").concat(orderTotalAmount.toString()));
               } else {
                 // 支付金额不足，标记为部分支付
                 order.payment_status = PaymentStatus.PartiallyPaid;
-                console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u90E8\u5206\u652F\u4ED8\uFF0C\u91D1\u989D: ").concat(totalPaidAmount.toString(), "/").concat(orderTotalAmount.toString()));
               }
 
               // 给后端标记一下是全部支付（paid）还是部分支付
@@ -1592,37 +1554,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return this.dbManager.update('order', order);
             case 8:
               if (!(paymentData.payments.length === 0)) {
-                _context18.next = 12;
+                _context18.next = 11;
                 break;
               }
-              console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u652F\u4ED8\u5904\u7406"));
               this.logWarning('Empty payment list', {
                 orderUuid: order.uuid,
                 orderId: order.order_id
               });
               return _context18.abrupt("return");
-            case 12:
-              _context18.next = 14;
+            case 11:
+              _context18.next = 13;
               return this.core.effects.emit("".concat(this.name, ":onPaymentSubmitted"), order);
-            case 14:
-              _context18.next = 16;
+            case 13:
+              _context18.next = 15;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'submit',
                 order: order
               });
-            case 16:
-              _context18.next = 22;
+            case 15:
+              _context18.next = 21;
               break;
-            case 18:
-              _context18.prev = 18;
+            case 17:
+              _context18.prev = 17;
               _context18.t0 = _context18["catch"](0);
               console.error("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25"), _context18.t0);
               throw _context18.t0;
-            case 22:
+            case 21:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 18]]);
+        }, _callee18, this, [[0, 17]]);
       }));
       function submitSingleOrderPayment(_x23) {
         return _submitSingleOrderPayment.apply(this, arguments);
@@ -1764,29 +1725,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       // 如果是定金模式，则使用deposit_amount 去减已付款金额
       var remainingAmount = order.is_deposit === 1 ? new Decimal(order.deposit_amount).minus(paidAmount) : totalAmount.minus(paidAmount);
       order.expect_amount = Decimal.max(0, remainingAmount).toFixed(2);
-      console.log("[PaymentModule] \u91CD\u65B0\u8BA1\u7B97\u8BA2\u5355\u91D1\u989D:", {
-        orderUuid: order.uuid,
-        totalAmount: order.total_amount,
-        effectivePaidAmount: paidAmount.toFixed(2),
-        remainingAmount: order.expect_amount,
-        activePayments: order.payment.filter(function (p) {
-          return p.status !== 'voided';
-        }).length,
-        voidedPayments: order.payment.filter(function (p) {
-          return p.status === 'voided';
-        }).length,
-        paymentDetails: order.payment.filter(function (p) {
-          return p.status !== 'voided';
-        }).map(function (p) {
-          return {
-            code: p.code,
-            amount: p.amount,
-            rounding_amount: p.rounding_amount || '0.00',
-            effective_amount: new Decimal(p.amount || 0).minus(new Decimal(p.rounding_amount || 0)).toFixed(2)
-          };
-        }),
-        说明: '有效支付金额包含抹零计算（amount + |rounding_amount|）'
-      });
     }
 
     /**
@@ -2017,62 +1955,59 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 计算基础值：x / interval
               baseValue = amount.div(roundingInterval);
-              console.log("[PaymentModule] \u820D\u5165\u8BA1\u7B97 - \u539F\u59CB\u91D1\u989D: ".concat(amount.toString(), ", \u95F4\u9694: ").concat(intervalValue, ", \u57FA\u7840\u503C: ").concat(baseValue.toString(), ", \u89C4\u5219: ").concat(rule));
               _context26.t0 = rule;
-              _context26.next = _context26.t0 === RoundingRule.Standard ? 13 : _context26.t0 === 'standard' ? 13 : _context26.t0 === RoundingRule.StandardDown ? 15 : _context26.t0 === 'standard_rounding_midpoint_down' ? 15 : _context26.t0 === RoundingRule.AlwaysUp ? 17 : _context26.t0 === 'always_up' ? 17 : _context26.t0 === RoundingRule.AlwaysDown ? 19 : _context26.t0 === 'always_down' ? 19 : 21;
+              _context26.next = _context26.t0 === RoundingRule.Standard ? 12 : _context26.t0 === 'standard' ? 12 : _context26.t0 === RoundingRule.StandardDown ? 14 : _context26.t0 === 'standard_rounding_midpoint_down' ? 14 : _context26.t0 === RoundingRule.AlwaysUp ? 16 : _context26.t0 === 'always_up' ? 16 : _context26.t0 === RoundingRule.AlwaysDown ? 18 : _context26.t0 === 'always_down' ? 18 : 20;
               break;
-            case 13:
+            case 12:
               // 标准舍入（中点向上）
               roundedValue = this.standardRound(baseValue, true);
-              return _context26.abrupt("break", 22);
-            case 15:
+              return _context26.abrupt("break", 21);
+            case 14:
               // 标准舍入（中点向下）
               roundedValue = this.standardRound(baseValue, false);
-              return _context26.abrupt("break", 22);
-            case 17:
+              return _context26.abrupt("break", 21);
+            case 16:
               // 总是向上舍入
               roundedValue = baseValue.ceil();
-              return _context26.abrupt("break", 22);
-            case 19:
+              return _context26.abrupt("break", 21);
+            case 18:
               // 总是向下舍入
               roundedValue = baseValue.floor();
-              return _context26.abrupt("break", 22);
-            case 21:
+              return _context26.abrupt("break", 21);
+            case 20:
               throw new Error("\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ".concat(rule));
-            case 22:
+            case 21:
               // 计算最终金额：roundedValue * interval
               finalAmount = roundedValue.mul(roundingInterval);
               originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
               if (!finalAmount.eq(0)) {
-                _context26.next = 27;
+                _context26.next = 25;
                 break;
               }
-              console.log("[PaymentModule] \u6700\u7EC8\u91D1\u989D\u4E3A0\uFF0C\u8FD4\u56DE\u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr));
               return _context26.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: originalAmountStr,
                 roundingDifference: '0.00'
               });
-            case 27:
+            case 25:
               roundedAmountStr = finalAmount.toFixed(2); // 计算舍入差额
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
-              console.log("[PaymentModule] \u820D\u5165\u7ED3\u679C - \u539F\u59CB\u91D1\u989D: ".concat(originalAmountStr, ", \u820D\u5165\u540E\u91D1\u989D: ").concat(roundedAmountStr, ", \u820D\u5165\u5DEE\u989D: ").concat(roundingDifferenceStr));
               return _context26.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
-            case 34:
-              _context26.prev = 34;
+            case 31:
+              _context26.prev = 31;
               _context26.t1 = _context26["catch"](0);
               console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
               throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
-            case 38:
+            case 35:
             case "end":
               return _context26.stop();
           }
-        }, _callee26, this, [[0, 34]]);
+        }, _callee26, this, [[0, 31]]);
       }));
       function roundAmountAsync(_x27, _x28, _x29) {
         return _roundAmountAsync.apply(this, arguments);

package/dist/modules/Product/types.d.ts

@@ -92,6 +92,8 @@ export interface ProductData {
     is_gst: number;
     /** 商品编码 */
     code: string;
+    /** ERP/生产侧商品编码；有规格时以选中 Variant 的值为准 */
+    production_code?: string;
     /** 商品条码 */
     barcode: string;
     /** 是否支持配送 */