@pisell/pisellos 2.2.282 → 2.2.284

package/lib/solution/BookingTicket/utils/weighingProductSku.js

@@ -1,63 +1,49 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BookingTicket/utils/weighingProductSku.ts
-var weighingProductSku_exports = {};
-__export(weighingProductSku_exports, {
-  buildProductSkuFromCacheItem: () => buildProductSkuFromCacheItem
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(weighingProductSku_exports);
-var WEIGHT_UNIT_MAP = {
-  KILOGRAMS: "kg",
-  GRAMS: "g",
-  POUNDS: "lb",
-  OUNCES: "oz"
+exports.buildProductSkuFromCacheItem = buildProductSkuFromCacheItem;
+const WEIGHT_UNIT_MAP = {
+  KILOGRAMS: 'kg',
+  GRAMS: 'g',
+  POUNDS: 'lb',
+  OUNCES: 'oz'
 };
 function isRecord(value) {
-  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 }
+
+/**
+ * 将规格弹窗的称重结果写入订单行权威字段 product_sku。
+ * 商品目录已有的 SKU 字段会保留，本次称重结果只覆盖运行态称重字段。
+ */
 function buildProductSkuFromCacheItem(cacheItem) {
-  var _a, _b, _c, _d;
-  const currentSku = isRecord(cacheItem == null ? void 0 : cacheItem.product_sku) ? cacheItem.product_sku : void 0;
-  const weighing = isRecord((_a = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _a.weighing) ? (_b = cacheItem == null ? void 0 : cacheItem._extend) == null ? void 0 : _b.weighing : void 0;
-  const hasRuntimeWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1 && ((currentSku == null ? void 0 : currentSku.weight) !== void 0 || (currentSku == null ? void 0 : currentSku.net_weight) !== void 0 || (currentSku == null ? void 0 : currentSku.weight_source) !== void 0);
-  const isWeighingSku = Number((currentSku == null ? void 0 : currentSku.open_sold_weight) || 0) === 1;
-  if (!isWeighingSku && !weighing)
-    return void 0;
-  if (hasRuntimeWeighingSku)
-    return { ...currentSku };
-  if (!weighing)
-    return currentSku ? { ...currentSku } : void 0;
+  const currentSku = isRecord(cacheItem?.product_sku) ? cacheItem.product_sku : undefined;
+  const weighing = isRecord(cacheItem?._extend?.weighing) ? cacheItem?._extend?.weighing : undefined;
+  const hasRuntimeWeighingSku = Number(currentSku?.open_sold_weight || 0) === 1 && (currentSku?.weight !== undefined || currentSku?.net_weight !== undefined || currentSku?.weight_source !== undefined);
+  const isWeighingSku = Number(currentSku?.open_sold_weight || 0) === 1;
+
+  // 普通商品维持旧转换行为，不把目录侧完整 SKU 引入订单行。
+  if (!isWeighingSku && !weighing) return undefined;
+  // 新版 SkuDetailModal 已直接生成 product_sku；_extend.weighing 只作为旧调用方回退。
+  if (hasRuntimeWeighingSku) return {
+    ...currentSku
+  };
+  if (!weighing) return currentSku ? {
+    ...currentSku
+  } : undefined;
   return {
-    ...currentSku || {},
+    ...(currentSku || {}),
     open_sold_weight: 1,
     unit_data_snapshot: weighing.scalePriceProduct,
     unit: WEIGHT_UNIT_MAP[String(weighing.unit)] || weighing.unit,
-    unit_weight: weighing.unit_weight ?? "1.000",
+    unit_weight: weighing.unit_weight ?? '1.000',
     unit_price: weighing.unit_price,
     weight_source: weighing.mode,
-    tare_name: ((_c = weighing.tare) == null ? void 0 : _c.label) ?? "",
-    tare_weight: ((_d = weighing.tare) == null ? void 0 : _d.value) ?? 0,
+    tare_name: weighing.tare?.label ?? '',
+    tare_weight: weighing.tare?.value ?? 0,
     weight: weighing.weight ?? 0,
     net_weight: weighing.net_weight ?? 0
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildProductSkuFromCacheItem
-});
+}

package/lib/solution/BuyTickets/index.js

@@ -1,67 +1,66 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BuyTickets/index.ts
-var BuyTickets_exports = {};
-__export(BuyTickets_exports, {
-  BuyTicketsImpl: () => BuyTicketsImpl
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(BuyTickets_exports);
-var import_modules = require("../../modules/");
-var import_BaseModule = require("../../modules/BaseModule");
-__reExport(BuyTickets_exports, require("./types"), module.exports);
-var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
+var _exportNames = {
+  BuyTicketsImpl: true
+};
+exports.BuyTicketsImpl = void 0;
+var _modules = require("../../modules/");
+var _BaseModule = require("../../modules/BaseModule");
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});
+class BuyTicketsImpl extends _BaseModule.BaseModule {
+  // 提供给 baseModule 用的默认名称 和 默认版本
+  defaultName = 'buyTickets';
+  defaultVersion = '1.0.0';
+  isSolution = true;
+  request;
+  window;
+  store;
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
-    // 提供给 baseModule 用的默认名称 和 默认版本
-    this.defaultName = "buyTickets";
-    this.defaultVersion = "1.0.0";
-    this.isSolution = true;
-    this.otherParams = {};
   }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store || {};
     this.otherParams = options.otherParams || {};
-    console.log("[BuyTickets] 初始化完成");
-    this.request = core.getPlugin("request");
-    this.window = core.getPlugin("window");
+    // 获取依赖的插件
+    this.request = core.getPlugin('request');
+    this.window = core.getPlugin('window');
     if (!this.request) {
-      throw new Error("购物车模块需要 request 插件支持");
+      throw new Error('购物车模块需要 request 插件支持');
     }
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
     }
     await this.core.effects.emit(`${this.name}:onInited`, {});
   }
+
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
-    const productsData = await this.request.post("/product/query", {
+    const productsData = await this.request.post('/product/query', {
       ids,
       open_quotation: 1,
       open_bundle: 1,
-      with: ["bundleGroup.bundleItem"],
-      status: "published",
+      with: ['bundleGroup.bundleItem'],
+      status: 'published',
       num: 10,
       skip: 1
     });
-    const mainProducts = new import_modules.ProductList(`product-kiosk-main-list`);
+    const mainProducts = new _modules.ProductList(`product-kiosk-main-list`);
     this.core.registerModule(mainProducts, {
       initialState: {
         list: productsData.data.list
@@ -70,66 +69,64 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     this.store.mainProducts = mainProducts;
     await this.core.effects.emit(`${this.name}:onMainProductsLoaded`, {});
   }
+
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是其他商品
-  async loadProductsByCategory(categoryId) {
-  }
+  async loadProductsByCategory(categoryId) {}
   async destroy() {
     await this.core.effects.emit(`${this.name}:onDestroy`, {});
-    console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
   async getProducts() {
-    var _a;
-    const mainData = await this.store.mainProducts.getProducts() || [];
-    const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(`${this.name}:onGetProducts`, [
-      ...mainData,
-      ...otherData
-    ]);
+    const mainData = (await this.store.mainProducts.getProducts()) || [];
+    const otherData = (await this.store.otherProducts?.getProducts()) || [];
+    await this.core.effects.emit(`${this.name}:onGetProducts`, [...mainData, ...otherData]);
     return [...mainData, ...otherData];
   }
+
   // 根据 id 获取商品详情，他会尝试先去主列表里找，找不到再去子列表，还找不到就报错
   async getProduct(id) {
-    var _a, _b;
-    const mainProduct = await ((_a = this.store.mainProducts) == null ? void 0 : _a.getProduct(id));
-    const otherProduct = await ((_b = this.store.otherProducts) == null ? void 0 : _b.getProduct(id));
-    if (mainProduct)
-      return mainProduct;
-    if (otherProduct)
-      return otherProduct;
+    const mainProduct = await this.store.mainProducts?.getProduct(id);
+    const otherProduct = await this.store.otherProducts?.getProduct(id);
+    if (mainProduct) return mainProduct;
+    if (otherProduct) return otherProduct;
     throw new Error(`Product not found: ${id}`);
   }
+
   // 商品列表页提交
   async listSubmit(data) {
     const res = await this.core.effects.emit(`${this.name}:onListSubmit`, {
       ...data,
       products: this.getProducts()
     });
-    if (res.status === false)
-      return res;
-    this.window.localStorage.setItem(
-      "buyTickets:listSubmit",
-      JSON.stringify({ ...data, products: this.getProducts() })
-    );
-    console.log("listSubmit 应该走逻辑层的 API 发请求了");
+    if (res.status === false) return res;
+    // 这里要搞一下缓存，等会，缓存往这写还是往哪儿写啊？
+    this.window.localStorage.setItem('buyTickets:listSubmit', JSON.stringify({
+      ...data,
+      products: this.getProducts()
+    }));
+    // 如果外部没有阻拦，则默认调用后端的保存至购物车接口，然后通知页面 push 到购物车页面
+    // 游乐场逻辑：这里会被 hook 先拦截一次，业务层展示 add other product
+    // 然后第二次继续被拦截，业务层把这里的数据推给 native 的购物车
+
+    // fetch('')
   }
+
   // 购物车提交
   async cartSubmit(data) {
     await this.core.effects.emit(`${this.name}:onCartSubmit`, {
       ...data,
       products: this.getProducts()
     });
+    // 如果外部没有阻拦，则默认调用后端的购物车提交接口，然后页面这边 push 到 checkout 页面
   }
+
   // 结算提交
   async checkoutSubmit(data) {
     await this.core.effects.emit(`${this.name}:onCheckoutSubmit`, {
       ...data,
       products: this.getProducts()
     });
+    // 如果外部没有阻拦，则默认调用后端的订单提交接口，然后拉起支付
   }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BuyTicketsImpl,
-  ...require("./types")
-});
+}
+exports.BuyTicketsImpl = BuyTicketsImpl;

package/lib/solution/BuyTickets/types.js

@@ -1,40 +1,24 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/solution/BuyTickets/types.ts
-var types_exports = {};
-__export(types_exports, {
-  BuyTicketsHooks: () => BuyTicketsHooks
-});
-module.exports = __toCommonJS(types_exports);
-var BuyTicketsHooks = /* @__PURE__ */ ((BuyTicketsHooks2) => {
-  BuyTicketsHooks2["onInited"] = "buyTickets:onInited";
-  BuyTicketsHooks2["onDestroy"] = "buyTickets:onDestroy";
-  BuyTicketsHooks2["onMainProductsLoaded"] = "buyTickets:onMainProductsLoaded";
-  BuyTicketsHooks2["onOtherProductsLoaded"] = "buyTickets:onOtherProductsLoaded";
-  BuyTicketsHooks2["OnGetProducts"] = "buyTickets:onGetProducts";
-  BuyTicketsHooks2["OnGetProduct"] = "buyTickets:onGetProduct";
-  BuyTicketsHooks2["onListSubmit"] = "buyTickets:onListSubmit";
-  BuyTicketsHooks2["onCartSubmit"] = "buyTickets:onCartubmit";
-  BuyTicketsHooks2["onCheckoutSubmit"] = "buyTickets:onCheckoutSubmit";
-  return BuyTicketsHooks2;
-})(BuyTicketsHooks || {});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BuyTicketsHooks
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.BuyTicketsHooks = void 0;
+/**
+ * 购票流程hook
+ */
+let BuyTicketsHooks = exports.BuyTicketsHooks = /*#__PURE__*/function (BuyTicketsHooks) {
+  BuyTicketsHooks["onInited"] = "buyTickets:onInited";
+  BuyTicketsHooks["onDestroy"] = "buyTickets:onDestroy";
+  BuyTicketsHooks["onMainProductsLoaded"] = "buyTickets:onMainProductsLoaded";
+  BuyTicketsHooks["onOtherProductsLoaded"] = "buyTickets:onOtherProductsLoaded";
+  BuyTicketsHooks["OnGetProducts"] = "buyTickets:onGetProducts";
+  BuyTicketsHooks["OnGetProduct"] = "buyTickets:onGetProduct";
+  BuyTicketsHooks["onListSubmit"] = "buyTickets:onListSubmit";
+  BuyTicketsHooks["onCartSubmit"] = "buyTickets:onCartubmit";
+  BuyTicketsHooks["onCheckoutSubmit"] = "buyTickets:onCheckoutSubmit";
+  return BuyTicketsHooks;
+}({});
+/**
+ * 票务状态接口
+ */