@pisell/pisellos 2.2.173 → 2.2.174

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

package/dist/modules/Order/utils.js

@@ -687,7 +687,8 @@ 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 : 0,
+    customer_id: (_tempOrder$customer_i = tempOrder.customer_id) !== null && _tempOrder$customer_i !== void 0 ? _tempOrder$customer_i : 1,
+    customer_name: tempOrder.customer_name || 'Select a customer',
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,

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

@@ -47,7 +47,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/dist/modules/Quotation/index.js

@@ -78,22 +78,21 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
-              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 6;
+              _context2.next = 5;
               return this.request.get('/quotation/available', query, {
                 useCache: false
               });
-            case 6:
+            case 5:
               res = _context2.sent;
-              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
+              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 10:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -220,14 +219,6 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
-  }, {
-    key: "filterQuotationsByCustomer",
-    value: function filterQuotationsByCustomer(list, customerId) {
-      var _this2 = this;
-      return list.filter(function (quotation) {
-        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
-      });
-    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -248,17 +239,17 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this3 = this;
+        _this2 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = [];
       quotation.schedule.forEach(function (s) {
-        var _this3$scheduleResolv;
-        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
+        var _this2$scheduleResolv;
+        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
         if (full) {
           scheduleItems.push(full);
           return;
         }
-        if (_this3.scheduleResolver) {
+        if (_this2.scheduleResolver) {
           return;
         }
         var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {

package/dist/server/modules/products/index.d.ts

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;

package/dist/server/modules/products/index.js

@@ -73,7 +73,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     // 普通层 QuotationModule 桥接器：本地计算报价单价格，替代 /product/query/price
     _defineProperty(_assertThisInitialized(_this), "quotationPriceBridge", void 0);
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeChannel", void 0);
-    _defineProperty(_assertThisInitialized(_this), "quotationBridgeCustomerId", void 0);
+    _defineProperty(_assertThisInitialized(_this), "quotationBridgeLoadedKey", '');
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeRefreshPromise", void 0);
     _defineProperty(_assertThisInitialized(_this), "quotationBridgeRefreshKey", void 0);
     // ---- 商品数据同步相关 ----
@@ -354,7 +354,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _refreshQuotationPriceBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var _this3 = this;
-        var customerId, refreshKey;
+        var refreshKey;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -364,37 +364,35 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               }
               return _context4.abrupt("return");
             case 2:
-              customerId = params && 'customer_id' in params ? params.customer_id : this.quotationBridgeCustomerId;
-              refreshKey = this.getQuotationBridgeScopeKey(customerId);
+              refreshKey = this.getQuotationBridgeScopeKey();
               if (!(this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey)) {
-                _context4.next = 8;
+                _context4.next = 7;
                 break;
               }
-              _context4.next = 7;
+              _context4.next = 6;
               return this.quotationBridgeRefreshPromise;
-            case 7:
+            case 6:
               return _context4.abrupt("return");
-            case 8:
+            case 7:
               if (!this.quotationBridgeRefreshPromise) {
-                _context4.next = 11;
+                _context4.next = 10;
                 break;
               }
-              _context4.next = 11;
+              _context4.next = 10;
               return this.quotationBridgeRefreshPromise;
-            case 11:
+            case 10:
               this.quotationBridgeRefreshKey = refreshKey;
               this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-                channel: this.quotationBridgeChannel,
-                customer_id: customerId
+                channel: this.quotationBridgeChannel
               }).then(function () {
-                _this3.quotationBridgeCustomerId = customerId;
+                _this3.quotationBridgeLoadedKey = refreshKey;
               }).finally(function () {
                 _this3.quotationBridgeRefreshPromise = undefined;
                 _this3.quotationBridgeRefreshKey = undefined;
               });
-              _context4.next = 15;
+              _context4.next = 14;
               return this.quotationBridgeRefreshPromise;
-            case 15:
+            case 14:
             case "end":
               return _context4.stop();
           }
@@ -432,7 +430,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               _context5.next = 7;
               return this.quotationBridgeRefreshPromise;
             case 7:
-              if (!(this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId))) {
+              if (!(this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey)) {
                 _context5.next = 10;
                 break;
               }
@@ -453,8 +451,8 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     }()
   }, {
     key: "getQuotationBridgeScopeKey",
-    value: function getQuotationBridgeScopeKey(customerId) {
-      return "".concat(this.quotationBridgeChannel || '', ":").concat(customerId !== null && customerId !== void 0 ? customerId : '');
+    value: function getQuotationBridgeScopeKey() {
+      return this.quotationBridgeChannel || '';
     }
   }, {
     key: "buildPriceDataFromQuotation",

package/dist/solution/BaseSales/index.js

@@ -1771,10 +1771,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order3, _tempOrder$products;
+      var _this$store$order3, _tempOrder$products, _tempOrder$products2;
       var tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
-      return tempOrder.products.map(function (product) {
+      // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
+      var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
+        return n.product_id;
+      });
+      return products.map(function (product) {
         var _product$product_vari, _product$is_charge_ta, _product$holder_id, _metadata$main_produc, _metadata$main_produc2;
         var metadata = product.metadata || {};
         return {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -75,7 +75,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$unique_ident, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _payload$option, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref25, _ref26, _origin$base_price, _ref27, _ref28, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref29, _ref30, _payload$tax_fee, _ref31, _ref32, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -92,7 +92,9 @@ export function transformBaseProductToOrderProduct(params) {
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeOptionItems((_ref24 = (_payload$option = payload.option) !== null && _payload$option !== void 0 ? _payload$option : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item);
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
-  var uniqueIdentificationNumber = (_payload$unique_ident = payload.unique_identification_number) !== null && _payload$unique_ident !== void 0 ? _payload$unique_ident : payload.unique;
+  // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
+  // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
+  var uniqueIdentificationNumber = payload.unique_identification_number;
   var resolvedQuantity = toSafePositiveInt((_payload$quantity = payload.quantity) !== null && _payload$quantity !== void 0 ? _payload$quantity : payload.num, 1);
   var originTotal = resolveManualDiscountOriginTotal({
     originTotal: payload.origin_total,

package/lib/modules/Order/utils.js

@@ -615,7 +615,8 @@ function buildSubmitPayload(params) {
   }
   const payload = {
     ...tempOrderRest,
-    customer_id: tempOrder.customer_id ?? 0,
+    customer_id: tempOrder.customer_id ?? 1,
+    customer_name: tempOrder.customer_name || "Select a customer",
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,

package/lib/modules/Quotation/index.d.ts

@@ -47,7 +47,6 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
-    private filterQuotationsByCustomer;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private isQuotationActiveAt;

package/lib/modules/Quotation/index.js

@@ -43,8 +43,6 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
-    if (params == null ? void 0 : params.customer_id)
-      query.customer_id = String(params.customer_id);
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
@@ -53,10 +51,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       query,
       { useCache: false }
     );
-    const list = this.filterQuotationsByCustomer(
-      ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [],
-      params == null ? void 0 : params.customer_id
-    );
+    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
     list.sort((a, b) => a.sort - b.sort);
     this.store.list = list;
   }
@@ -130,9 +125,6 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
-  filterQuotationsByCustomer(list, customerId) {
-    return list.filter((quotation) => this.isQuotationVisibleForCustomer(quotation, customerId));
-  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)

package/lib/server/modules/products/index.d.ts

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;

package/lib/server/modules/products/index.js

@@ -44,6 +44,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.formatters = [];
     // 是否已注册内置价格格式化器
     this.isPriceFormatterRegistered = false;
+    this.quotationBridgeLoadedKey = "";
     this.pendingSyncMessages = [];
   }
   async initialize(core, options) {
@@ -220,8 +221,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   async refreshQuotationPriceBridge(params) {
     if (!this.quotationPriceBridge)
       return;
-    const customerId = params && "customer_id" in params ? params.customer_id : this.quotationBridgeCustomerId;
-    const refreshKey = this.getQuotationBridgeScopeKey(customerId);
+    const refreshKey = this.getQuotationBridgeScopeKey();
     if (this.quotationBridgeRefreshPromise && this.quotationBridgeRefreshKey === refreshKey) {
       await this.quotationBridgeRefreshPromise;
       return;
@@ -231,10 +231,9 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
     this.quotationBridgeRefreshKey = refreshKey;
     this.quotationBridgeRefreshPromise = this.quotationPriceBridge.loadQuotations({
-      channel: this.quotationBridgeChannel,
-      customer_id: customerId
+      channel: this.quotationBridgeChannel
     }).then(() => {
-      this.quotationBridgeCustomerId = customerId;
+      this.quotationBridgeLoadedKey = refreshKey;
     }).finally(() => {
       this.quotationBridgeRefreshPromise = void 0;
       this.quotationBridgeRefreshKey = void 0;
@@ -253,12 +252,12 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     if (this.quotationBridgeRefreshPromise) {
       await this.quotationBridgeRefreshPromise;
     }
-    if (this.getQuotationBridgeScopeKey(customerId) !== this.getQuotationBridgeScopeKey(this.quotationBridgeCustomerId)) {
+    if (this.getQuotationBridgeScopeKey() !== this.quotationBridgeLoadedKey) {
       await this.refreshQuotationPriceBridge({ customer_id: customerId });
     }
   }
-  getQuotationBridgeScopeKey(customerId) {
-    return `${this.quotationBridgeChannel || ""}:${customerId ?? ""}`;
+  getQuotationBridgeScopeKey() {
+    return this.quotationBridgeChannel || "";
   }
   buildPriceDataFromQuotation(product, datetime, customerId) {
     var _a;

package/lib/solution/BaseSales/index.js

@@ -1035,11 +1035,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.updateVoucherOrderPayments(payments);
   }
   getWalletProductList() {
-    var _a, _b;
+    var _a, _b, _c;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
-    return tempOrder.products.map((product) => {
+    const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
+    return products.map((product) => {
       const metadata = product.metadata || {};
       return {
         product_id: product.product_id,

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -124,7 +124,7 @@ function transformBaseProductToOrderProduct(params) {
     payload.bundle ?? payload.product_bundle,
     hasPriceOverride
   );
-  const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
+  const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
   const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.173",
+  "version": "2.2.174",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",