@pisell/pisellos 2.2.264 → 2.2.265

package/dist/modules/Order/utils.js

@@ -21,6 +21,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
+import { createUuidV4 } from "./utils/orderCollectionIdentity";
 /**
  * 把"含 option 的主商品单价"与 bundle 合成"单行 composite 单价"。
  *
@@ -252,8 +253,8 @@ function getOrderProductDeposit(product, runtimeOrigin) {
 /**
  * 仅基于 tempOrder.products 重算整单定金。
  *
- * 对齐 Checkout relation_products 分支：商品定金先按商品规则计算，
- * 再扣减商品券/折扣卡抵扣金额；tempOrder.bookings 不参与这里的计算。
+ * 商品折扣在进入定金计算前已体现在商品行价格字段中，
+ * 因此这里只按商品定金规则汇总，不再扣减 discount_list；tempOrder.bookings 不参与这里的计算。
  */
 export function calculateOrderProductsDeposit() {
   var products = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -273,30 +274,18 @@ export function calculateOrderProductsDeposit() {
       product.deposit = deposit;
       if (!(deposit !== null && deposit !== void 0 && deposit.total) || Number(deposit.total) <= 0) continue;
       total = total.plus(deposit.total);
-      var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+      var _iterator4 = _createForOfIteratorHelper(deposit.protocols || []),
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var discount = _step4.value;
-          total = total.minus((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
+          var protocol = _step4.value;
+          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
         }
       } catch (err) {
         _iterator4.e(err);
       } finally {
         _iterator4.f();
       }
-      var _iterator5 = _createForOfIteratorHelper(deposit.protocols || []),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var protocol = _step5.value;
-          if (!protocolMap.has(protocol.id)) protocolMap.set(protocol.id, protocol);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
       hasDeposit = true;
     }
   } catch (err) {
@@ -460,19 +449,19 @@ function resolveSubmitBundleMapId(bundle) {
 }
 function collectSubmitProductDiscountList(product) {
   var submitDiscountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? _toConsumableArray(product.discount_list) : [];
-  var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
-    _step6;
+  var _iterator5 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
+    _step5;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-      var bundle = _step6.value;
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var bundle = _step5.value;
       if (!bundle || _typeof(bundle) !== 'object') continue;
       var bundleMapId = resolveSubmitBundleMapId(bundle);
       var bundleDiscountList = Array.isArray(bundle.discount_list) ? bundle.discount_list : [];
-      var _iterator7 = _createForOfIteratorHelper(bundleDiscountList),
-        _step7;
+      var _iterator6 = _createForOfIteratorHelper(bundleDiscountList),
+        _step6;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var discount = _step7.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var discount = _step6.value;
           if (!discount || _typeof(discount) !== 'object') continue;
           var discountMetadata = discount.metadata && _typeof(discount.metadata) === 'object' ? discount.metadata : {};
           var discountMapId = discountMetadata.custom_product_bundle_map_id !== undefined && discountMetadata.custom_product_bundle_map_id !== null && discountMetadata.custom_product_bundle_map_id !== '' ? discountMetadata.custom_product_bundle_map_id : bundleMapId;
@@ -483,15 +472,15 @@ function collectSubmitProductDiscountList(product) {
           } : {}));
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator7.f();
+        _iterator6.f();
       }
     }
   } catch (err) {
-    _iterator6.e(err);
+    _iterator5.e(err);
   } finally {
-    _iterator6.f();
+    _iterator5.f();
   }
   return normalizeOrderProductDiscountList(submitDiscountList);
 }
@@ -544,8 +533,7 @@ export function resolveEffectivePerUnitDiscount(product) {
     return sum + Number((discount === null || discount === void 0 ? void 0 : discount.amount) || 0);
   }, 0);
   var hasPromoDiscountItem = discountList.some(function (item) {
-    var _item$metadata, _item$metadata2;
-    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion' || (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+    return (item === null || item === void 0 ? void 0 : item.type) === 'promotion';
   });
   if (hasPromoDiscountItem) return fromList;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
@@ -587,11 +575,14 @@ export function createDefaultOrderRulesHooks() {
       if (!bundle || _typeof(bundle) !== 'object') return bundle;
       var current = currentByIdentity.get(getBundleIdentity(bundle));
       if (!current) return bundle;
+      var bundleWithDisplayFields = _objectSpread(_objectSpread({}, bundle), isEmptyOrderProductDisplayValue(bundle.cover) && !isEmptyOrderProductDisplayValue(current.cover) ? {
+        cover: current.cover
+      } : {});
       var isProductPriceBundle = ((_bundle$price_type_ex2 = bundle.price_type_ext) !== null && _bundle$price_type_ex2 !== void 0 ? _bundle$price_type_ex2 : current.price_type_ext) === 'product_price';
-      if (!isProductPriceBundle) return bundle;
+      if (!isProductPriceBundle) return bundleWithDisplayFields;
       var sourcePrice = (_ref18 = (_ref19 = (_current$price = current.price) !== null && _current$price !== void 0 ? _current$price : current.custom_price) !== null && _ref19 !== void 0 ? _ref19 : current.original_price) !== null && _ref18 !== void 0 ? _ref18 : current.bundle_selling_price;
       var originalPrice = (_ref20 = (_ref21 = (_ref22 = (_current$original_pri = current.original_price) !== null && _current$original_pri !== void 0 ? _current$original_pri : current.product_price) !== null && _ref22 !== void 0 ? _ref22 : current.price) !== null && _ref21 !== void 0 ? _ref21 : current.custom_price) !== null && _ref20 !== void 0 ? _ref20 : sourcePrice;
-      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundle), sourcePrice !== undefined ? {
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, bundleWithDisplayFields), sourcePrice !== undefined ? {
         price: sourcePrice
       } : {}), originalPrice !== undefined ? {
         original_price: originalPrice
@@ -764,14 +755,7 @@ export var getAllDiscountList = function getAllDiscountList(cartItem) {
 
 // ─── 以下为从 ScanOrder/utils.ts 迁入的 Order 专属工具函数 ───
 
-export function createUuidV4() {
-  var template = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
-  return template.replace(/[xy]/g, function (char) {
-    var randomValue = Math.floor(Math.random() * 16);
-    var value = char === 'x' ? randomValue : randomValue & 0x3 | 0x8;
-    return value.toString(16);
-  });
-}
+export { createUuidV4 };
 export function isTempOrder(data) {
   if (!data || _typeof(data) !== 'object') return false;
   if (!Array.isArray(data.products)) return false;
@@ -864,6 +848,7 @@ function formatSubmitBundleItems(bundle) {
       bundle_group_id: (_rawBundle$bundle_gro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_group_id) !== null && _rawBundle$bundle_gro !== void 0 ? _rawBundle$bundle_gro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
       bundle_id: (_rawBundle$bundle_id = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_id) !== null && _rawBundle$bundle_id !== void 0 ? _rawBundle$bundle_id : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.id,
       bundle_product_id: (_rawBundle$bundle_pro = rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.bundle_product_id) !== null && _rawBundle$bundle_pro !== void 0 ? _rawBundle$bundle_pro : rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle._bundle_product_id,
+      cover: rawBundle.cover,
       metadata: _objectSpread(_objectSpread(_objectSpread({}, submitMetadata), hasSubmitBundleDiscounts && bundleMapId !== undefined ? {
         custom_product_bundle_map_id: bundleMapId
       } : {}), {}, {
@@ -925,6 +910,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.is_rule !== undefined) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
+  if (rawMetadata.holder_config !== undefined) {
+    cleanMetadata.holder_config = rawMetadata.holder_config;
+  }
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
     option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
@@ -955,19 +943,19 @@ export function normalizeBookingSubType(booking) {
 export function normalizeSubmitBooking(booking) {
   var rawMetadata = booking.metadata || {};
   var cleanMetadata = {};
-  var _iterator8 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
-    _step8;
+  var _iterator7 = _createForOfIteratorHelper(SUBMIT_BOOKING_METADATA_WHITELIST),
+    _step7;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-      var key = _step8.value;
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var key = _step7.value;
       if (rawMetadata[key] !== undefined) {
         cleanMetadata[key] = rawMetadata[key];
       }
     }
   } catch (err) {
-    _iterator8.e(err);
+    _iterator7.e(err);
   } finally {
-    _iterator8.f();
+    _iterator7.f();
   }
   if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
   var bookingRecord = booking;
@@ -1059,7 +1047,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _tempOrder$customer_i, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
+  var _tempOrder$customer_i, _tempOrder$country_ca, _tempOrder$phone, _tempOrder$email, _tempOrder$order_numb, _tempOrder$shop_order, _tempOrder$shop_full_, _ref30, _tempOrder$is_price_i, _tempOrder$is_deposit, _enhancedPayload$summ;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -1105,6 +1093,9 @@ export function buildSubmitPayload(params) {
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
     customer_name: tempOrder.customer_name || 'Walk-In',
+    country_calling_code: String((_tempOrder$country_ca = tempOrder.country_calling_code) !== null && _tempOrder$country_ca !== void 0 ? _tempOrder$country_ca : ''),
+    phone: String((_tempOrder$phone = tempOrder.phone) !== null && _tempOrder$phone !== void 0 ? _tempOrder$phone : ''),
+    email: String((_tempOrder$email = tempOrder.email) !== null && _tempOrder$email !== void 0 ? _tempOrder$email : ''),
     order_number: (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : null,
     shop_order_number: (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : null,
     shop_full_order_number: (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : null,
@@ -1164,9 +1155,7 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   var item = paymentItem;
   var customPaymentId = (_item$custom_payment_ = item.custom_payment_id) !== null && _item$custom_payment_ !== void 0 ? _item$custom_payment_ : item.id;
   var metadata = item.metadata && _typeof(item.metadata) === 'object' ? _objectSpread({}, item.metadata) : {};
-  if (item.uuid && !metadata.unique_payment_number) {
-    metadata.unique_payment_number = String(item.uuid);
-  }
+  var paymentNumber = item.payment_number;
   var paymentMetadataKeys = ['rounding_rule', 'shop_wallet_pass_id', 'actual_paid_amount', 'change_given_amount'];
   for (var _i3 = 0, _paymentMetadataKeys = paymentMetadataKeys; _i3 < _paymentMetadataKeys.length; _i3++) {
     var key = _paymentMetadataKeys[_i3];
@@ -1177,8 +1166,10 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   var timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
   var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : timestamp;
   var createdAt = (_item$created_at = item.created_at) !== null && _item$created_at !== void 0 ? _item$created_at : timestamp;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
     order_payment_id: item.order_payment_id
+  } : {}), paymentNumber !== undefined && paymentNumber !== null && paymentNumber !== '' ? {
+    payment_number: String(paymentNumber)
   } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),
@@ -1280,25 +1271,25 @@ export function clearTempOrderHolderAssignments(tempOrder) {
     target[key] = null;
     changed = true;
   };
-  var _iterator9 = _createForOfIteratorHelper(tempOrder.products || []),
-    _step9;
+  var _iterator8 = _createForOfIteratorHelper(tempOrder.products || []),
+    _step8;
   try {
-    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-      var product = _step9.value;
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      var product = _step8.value;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         resetHolderField(product.metadata);
       }
     }
   } catch (err) {
-    _iterator9.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator9.f();
+    _iterator8.f();
   }
-  var _iterator10 = _createForOfIteratorHelper(tempOrder.bookings || []),
-    _step10;
+  var _iterator9 = _createForOfIteratorHelper(tempOrder.bookings || []),
+    _step9;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var booking = _step10.value;
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+      var booking = _step9.value;
       var bookingRecord = booking;
       if (booking.metadata && _typeof(booking.metadata) === 'object') {
         resetHolderField(booking.metadata);
@@ -1309,9 +1300,9 @@ export function clearTempOrderHolderAssignments(tempOrder) {
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator10.f();
+    _iterator9.f();
   }
   var productsByUid = (_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.productsByUid;
   if (productsByUid && _typeof(productsByUid) === 'object') {
@@ -1362,11 +1353,16 @@ export function isHolderConfigRequired(holderConfig) {
   return Number(holderConfig.required) === 1;
 }
 export function productRequiresFormSubject(tempOrder, product) {
+  var _tempOrder$products, _orderProduct$metadat;
+  var _orderProduct = tempOrder === null || tempOrder === void 0 || (_tempOrder$products = tempOrder.products) === null || _tempOrder$products === void 0 ? void 0 : _tempOrder$products.find(function (item) {
+    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
+  });
   var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
-  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
+  return isHolderConfigRequired(_orderProduct === null || _orderProduct === void 0 || (_orderProduct$metadat = _orderProduct.metadata) === null || _orderProduct$metadat === void 0 ? void 0 : _orderProduct$metadat.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config) || isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config);
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
+  debugger;
   // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
   if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
   if (product) return productRequiresFormSubject(tempOrder, product);
@@ -1406,7 +1402,7 @@ export function isEmptyOrderProductDisplayValue(value) {
  */
 export function mergeOrderProductDisplayFields(previous, next) {
   var merged = _objectSpread({}, next);
-  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku', 'payment_price'];
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'product_cover', 'variant_title', 'product_sku', 'payment_price'];
   displayFields.forEach(function (field) {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
       merged[field] = previous[field];

package/dist/modules/Payment/index.d.ts

@@ -20,6 +20,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     protected defaultVersion: string;
     request: RequestPlugin;
     private app;
+    private appPlugin;
     private store;
     window: WindowPlugin;
     private dbManager;
@@ -40,6 +41,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    private getPaymentNumberAppData;
     /**
      * 记录信息日志
      */

package/dist/modules/Payment/index.js

@@ -27,6 +27,9 @@ import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
 import { WalletPassPaymentImpl } from "./walletpass";
 import { Decimal } from 'decimal.js';
+import { ensureOrderPaymentNumber } from "../Order/payment-utils";
+import { createUuidV4 } from "../Order/utils";
+import { resolvePaymentNumberDevicePrefix } from "../../utils/payment-number";
 export * from "./types";
 export { generateRequestUniqueId };
 
@@ -102,6 +105,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "app", void 0);
     // App instance
+    _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     // WindowPlugin 实例
@@ -168,7 +172,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var appPlugin;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -178,7 +181,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
-              appPlugin = core.getPlugin('app');
+              this.appPlugin = core.getPlugin('app');
               this.window = core.getPlugin('window');
               if (this.request) {
                 _context.next = 8;
@@ -186,13 +189,13 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('支付模块需要 request 插件支持');
             case 8:
-              if (appPlugin) {
+              if (this.appPlugin) {
                 _context.next = 10;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
             case 10:
-              this.app = appPlugin.getApp();
+              this.app = this.appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
@@ -228,6 +231,15 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       this.otherParams = params || {};
     }
+  }, {
+    key: "getPaymentNumberAppData",
+    value: function getPaymentNumberAppData(key) {
+      var _this$appPlugin, _this$appPlugin$getDa, _this$app, _this$app$getStore, _this$app$getStore$ca, _this$app$getStore$ca2;
+      var getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+      if (typeof getData === 'function') return getData(key);
+      var coreData = (_this$app = this.app) === null || _this$app === void 0 || (_this$app = _this$app.models) === null || _this$app === void 0 || (_this$app$getStore = _this$app.getStore) === null || _this$app$getStore === void 0 || (_this$app$getStore$ca = (_this$app$getStore$ca2 = _this$app$getStore.call(_this$app)).getDataByModel) === null || _this$app$getStore$ca === void 0 ? void 0 : _this$app$getStore$ca.call(_this$app$getStore$ca2, 'core', 'core');
+      return coreData === null || coreData === void 0 ? void 0 : coreData[key];
+    }
 
     /**
      * 记录信息日志
@@ -884,7 +896,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(orderUuid, paymentItem) {
-        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, newPaymentItem;
+        var _this5 = this;
+        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, hasPaymentNumber, paymentNumberDevicePrefix, paymentNumber, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -940,14 +953,29 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
               throw new Error(warningMessage);
             case 17:
-              if ((_paymentItem$metadata = paymentItem.metadata) !== null && _paymentItem$metadata !== void 0 && _paymentItem$metadata.unique_payment_number) {
-                paymentUuid = paymentItem.metadata.unique_payment_number;
-              } else {
-                paymentUuid = getUniqueId('payment_');
-              }
+              paymentUuid = paymentItem.uuid || ((_paymentItem$metadata = paymentItem.metadata) === null || _paymentItem$metadata === void 0 ? void 0 : _paymentItem$metadata.unique_payment_number) || getUniqueId('payment_');
               currentTime = formatDateTime(new Date());
+              hasPaymentNumber = String(paymentItem.payment_number || '').trim() !== '';
+              if (!hasPaymentNumber) {
+                _context12.next = 24;
+                break;
+              }
+              _context12.t0 = 'LOCAL';
+              _context12.next = 27;
+              break;
+            case 24:
+              _context12.next = 26;
+              return resolvePaymentNumberDevicePrefix(function (key) {
+                return _this5.getPaymentNumberAppData(key);
+              });
+            case 26:
+              _context12.t0 = _context12.sent;
+            case 27:
+              paymentNumberDevicePrefix = _context12.t0;
+              paymentNumber = ensureOrderPaymentNumber(paymentItem, paymentNumberDevicePrefix, createUuidV4).payment_number;
               newPaymentItem = {
                 uuid: paymentUuid,
+                payment_number: paymentNumber,
                 custom_payment_id: normalizeCustomPaymentId(paymentItem),
                 name: paymentItem.name,
                 code: paymentItem.code,
@@ -966,10 +994,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 创建时间
                 updated_at: currentTime,
                 // 更新时间
-                metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
-                  // 保留传入的所有 metadata 字段
-                  unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
-                })
+                metadata: _objectSpread({}, paymentItem.metadata)
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
@@ -977,9 +1002,9 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderUuid: orderUuid,
                 order: order
               });
-              _context12.next = 25;
+              _context12.next = 35;
               return this.dbManager.update('order', order, true);
-            case 25:
+            case 35:
               this.logInfo('更新订单支付项完成', {
                 orderUuid: orderUuid
               });
@@ -1000,22 +1025,22 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 actualPaidAmount: (_newPaymentItem$metad2 = newPaymentItem.metadata) === null || _newPaymentItem$metad2 === void 0 ? void 0 : _newPaymentItem$metad2.actual_paid_amount,
                 changeGivenAmount: (_newPaymentItem$metad3 = newPaymentItem.metadata) === null || _newPaymentItem$metad3 === void 0 ? void 0 : _newPaymentItem$metad3.change_given_amount
               });
-              _context12.next = 35;
+              _context12.next = 45;
               break;
-            case 30:
-              _context12.prev = 30;
-              _context12.t0 = _context12["catch"](1);
-              console.error('[PaymentModule] 添加支付项失败', _context12.t0);
-              this.logError('addPaymentItemAsync failed', _context12.t0, {
+            case 40:
+              _context12.prev = 40;
+              _context12.t1 = _context12["catch"](1);
+              console.error('[PaymentModule] 添加支付项失败', _context12.t1);
+              this.logError('addPaymentItemAsync failed', _context12.t1, {
                 orderUuid: orderUuid,
                 paymentItem: paymentItem
               });
-              throw _context12.t0;
-            case 35:
+              throw _context12.t1;
+            case 45:
             case "end":
               return _context12.stop();
           }
-        }, _callee12, this, [[1, 30]]);
+        }, _callee12, this, [[1, 40]]);
       }));
       function addPaymentItemAsync(_x13, _x14) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1135,17 +1160,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
       var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(orderUuid, voucherPaymentItems) {
-        var _this5 = this;
+        var _this6 = this;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
               return _context15.abrupt("return", this.runVoucherUpdateLocked(orderUuid, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-                var _this5$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator2, _step2, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator3, _step3, _voucherItem, orderPaymentType, key, updatedOrder;
+                var _this6$normalizeVouch, normalizedVoucherItems, originalCount, normalizedCount, order, existingVoucherItems, _iterator2, _step2, voucherItem, orderAfterDelete, existingActiveVoucherKeys, _iterator3, _step3, _voucherItem, orderPaymentType, key, updatedOrder;
                 return _regeneratorRuntime().wrap(function _callee14$(_context14) {
                   while (1) switch (_context14.prev = _context14.next) {
                     case 0:
-                      _this5$normalizeVouch = _this5.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this5$normalizeVouch.items, originalCount = _this5$normalizeVouch.originalCount, normalizedCount = _this5$normalizeVouch.normalizedCount;
-                      _this5.logInfo('Starting updateVoucherPaymentItemsAsync', {
+                      _this6$normalizeVouch = _this6.normalizeVoucherPaymentItems(voucherPaymentItems), normalizedVoucherItems = _this6$normalizeVouch.items, originalCount = _this6$normalizeVouch.originalCount, normalizedCount = _this6$normalizeVouch.normalizedCount;
+                      _this6.logInfo('Starting updateVoucherPaymentItemsAsync', {
                         orderUuid: orderUuid,
                         originalVoucherCount: originalCount,
                         normalizedVoucherCount: normalizedCount,
@@ -1167,7 +1192,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       }
                       _context14.prev = 3;
                       _context14.next = 6;
-                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
                     case 6:
                       order = _context14.sent;
                       if (order) {
@@ -1207,7 +1232,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       voucherItem = _step2.value;
                       console.log("[PaymentModule] \u5220\u9664\u73B0\u6709\u4EE3\u91D1\u5238\u652F\u4ED8\u9879: ".concat(voucherItem.uuid));
                       _context14.next = 19;
-                      return _this5.deletePaymentAsync(orderUuid, voucherItem.uuid);
+                      return _this6.deletePaymentAsync(orderUuid, voucherItem.uuid);
                     case 19:
                       _context14.next = 14;
                       break;
@@ -1224,7 +1249,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       return _context14.finish(26);
                     case 29:
                       _context14.next = 31;
-                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
                     case 31:
                       orderAfterDelete = _context14.sent;
                       if (orderAfterDelete) {
@@ -1271,7 +1296,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                         order_payment_type: orderPaymentType
                       }));
                       _context14.next = 49;
-                      return _this5.addPaymentItemAsync(orderUuid, _voucherItem);
+                      return _this6.addPaymentItemAsync(orderUuid, _voucherItem);
                     case 49:
                       existingActiveVoucherKeys.add(key);
                     case 50:
@@ -1290,17 +1315,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       return _context14.finish(57);
                     case 60:
                       _context14.next = 62;
-                      return _this5.getPaymentOrderByUuidAsync(orderUuid);
+                      return _this6.getPaymentOrderByUuidAsync(orderUuid);
                     case 62:
                       updatedOrder = _context14.sent;
                       _context14.next = 65;
-                      return _this5.core.effects.emit("".concat(_this5.name, ":onPaymentAdded"), {
+                      return _this6.core.effects.emit("".concat(_this6.name, ":onPaymentAdded"), {
                         orderUuid: orderUuid,
                         order: updatedOrder,
                         payment: null // 批量操作不提供单个支付项
                       });
                     case 65:
-                      _this5.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
+                      _this6.logInfo('updateVoucherPaymentItemsAsync completed successfully', {
                         orderUuid: orderUuid,
                         removedVoucherCount: existingVoucherItems.length,
                         addedVoucherCount: normalizedVoucherItems.length,
@@ -1312,7 +1337,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       _context14.prev = 68;
                       _context14.t2 = _context14["catch"](3);
                       console.error('[PaymentModule] 批量更新代金券支付项失败:', _context14.t2);
-                      _this5.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
+                      _this6.logError('updateVoucherPaymentItemsAsync failed', _context14.t2, {
                         orderUuid: orderUuid,
                         voucherPaymentItems: voucherPaymentItems
                       });
@@ -1361,7 +1386,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 return payment.uuid === paymentUuid;
               });
               if (!paymentItem) {
-                _context16.next = 18;
+                _context16.next = 19;
                 break;
               }
               // 如果更新参数中包含 amount，先格式化
@@ -1369,40 +1394,43 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               if ('amount' in formattedParams && formattedParams.amount !== undefined) {
                 formattedParams.amount = formatAmount(formattedParams.amount);
               }
+              if (formattedParams.metadata && _typeof(formattedParams.metadata) === 'object') {
+                formattedParams.metadata = _objectSpread(_objectSpread({}, paymentItem.metadata || {}), formattedParams.metadata);
+              }
               Object.assign(paymentItem, formattedParams);
 
               // 重新计算待付金额
               this.recalculateOrderAmount(order);
 
               // 更新到 IndexDB
-              _context16.next = 14;
+              _context16.next = 15;
               return this.dbManager.update('order', order);
-            case 14:
-              _context16.next = 16;
+            case 15:
+              _context16.next = 17;
               return this.core.effects.emit("".concat(this.name, ":onPaymentUpdated"), {
                 order: order,
                 paymentItem: paymentItem
               });
-            case 16:
-              _context16.next = 18;
+            case 17:
+              _context16.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onOrderChanged"), {
                 action: 'payment_update',
                 order: order,
                 paymentItem: paymentItem
               });
-            case 18:
-              _context16.next = 24;
+            case 19:
+              _context16.next = 25;
               break;
-            case 20:
-              _context16.prev = 20;
+            case 21:
+              _context16.prev = 21;
               _context16.t0 = _context16["catch"](0);
               console.error('[PaymentModule] 更新支付项失败', _context16.t0);
               throw _context16.t0;
-            case 24:
+            case 25:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this, [[0, 20]]);
+        }, _callee16, this, [[0, 21]]);
       }));
       function updatePaymentAsync(_x19, _x20, _x21) {
         return _updatePaymentAsync.apply(this, arguments);
@@ -1518,6 +1546,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 payments: order.payment.map(function (payment) {
                   return {
                     uuid: payment.uuid,
+                    payment_number: payment.payment_number,
                     amount: payment.amount,
                     code: payment.code,
                     custom_payment_id: payment.custom_payment_id,