@pisell/pisellos 2.2.132 → 2.2.134

package/dist/modules/Payment/index.js

@@ -76,6 +76,13 @@ function generateRequestUniqueId() {
 
   return "".concat(year).concat(month).concat(day).concat(hour).concat(minute).concat(second).concat(millisecond).concat(randomDigits);
 }
+function normalizeCustomPaymentId(paymentItem) {
+  var _ref, _paymentItem$custom_p;
+  var rawId = (_ref = (_paymentItem$custom_p = paymentItem.custom_payment_id) !== null && _paymentItem$custom_p !== void 0 ? _paymentItem$custom_p : paymentItem.id) !== null && _ref !== void 0 ? _ref : 0;
+  var parsedId = Number(rawId);
+  if (!Number.isFinite(parsedId)) return 0;
+  return parsedId;
+}
 
 /**
  * 支付模块实现
@@ -297,7 +304,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       var network = this.app.plugins.get('network');
       this.logInfo('Registering network status listener');
       network === null || network === void 0 || network.addListener('networkStatusChange', /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -317,7 +324,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           }, _callee2);
         }));
         return function (_x3) {
-          return _ref.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }());
     }
@@ -1251,12 +1258,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                custom_payment_id: paymentItem.custom_payment_id || 0,
+                custom_payment_id: normalizeCustomPaymentId(paymentItem),
                 name: paymentItem.name,
                 code: paymentItem.code,
                 type: paymentItem.type,
                 amount: formatAmount(paymentItem.amount),
                 voucher_id: paymentItem.voucher_id || '',
+                wallet_pass_usage_unit: paymentItem.wallet_pass_usage_unit,
+                wallet_pass_use_value: paymentItem.wallet_pass_use_value,
                 rounding_amount: paymentItem.rounding_amount || '0.00',
                 service_charge: paymentItem.service_charge,
                 status: 'active',

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

@@ -104,7 +104,11 @@ export interface PaymentItem {
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
+    /** Wallet Pass 使用单位配置 */
+    wallet_pass_usage_unit?: unknown;
+    /** Wallet Pass 本次使用值 */
+    wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
     metadata?: {
         /** 钱箱 ID */
@@ -227,13 +231,19 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    custom_payment_id: number;
+    custom_payment_id?: string | number;
+    /** 兼容旧调用方传入的支付方式 id */
+    id?: string | number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
+    /** Wallet Pass 使用单位配置 */
+    wallet_pass_usage_unit?: unknown;
+    /** Wallet Pass 本次使用值 */
+    wallet_pass_use_value?: string | number | null;
     /** 三方支付手续费 */
     service_charge?: {
         percentage?: string;

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Rules/index.js

@@ -159,10 +159,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      // 保留之前扫码得到的商品券（isScan: true）
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
-        return !discount.isEditMode && discount.tag !== 'good_pass';
+        return !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan);
       });
-      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
+      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),

package/dist/solution/ShopDiscount/index.js

@@ -480,7 +480,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
-              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
+              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
                 _context5.next = 24;
                 break;
               }

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Payment/index.js

@@ -62,6 +62,13 @@ function generateRequestUniqueId() {
   const randomDigits = Math.floor(Math.random() * 9e3) + 1e3;
   return `${year}${month}${day}${hour}${minute}${second}${millisecond}${randomDigits}`;
 }
+function normalizeCustomPaymentId(paymentItem) {
+  const rawId = paymentItem.custom_payment_id ?? paymentItem.id ?? 0;
+  const parsedId = Number(rawId);
+  if (!Number.isFinite(parsedId))
+    return 0;
+  return parsedId;
+}
 var PaymentModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "payment", version);
@@ -633,12 +640,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
       const newPaymentItem = {
         uuid: paymentUuid,
-        custom_payment_id: paymentItem.custom_payment_id || 0,
+        custom_payment_id: normalizeCustomPaymentId(paymentItem),
         name: paymentItem.name,
         code: paymentItem.code,
         type: paymentItem.type,
         amount: formatAmount(paymentItem.amount),
         voucher_id: paymentItem.voucher_id || "",
+        wallet_pass_usage_unit: paymentItem.wallet_pass_usage_unit,
+        wallet_pass_use_value: paymentItem.wallet_pass_use_value,
         rounding_amount: paymentItem.rounding_amount || "0.00",
         service_charge: paymentItem.service_charge,
         status: "active",

package/lib/modules/Payment/types.d.ts

@@ -104,7 +104,11 @@ export interface PaymentItem {
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
+    /** Wallet Pass 使用单位配置 */
+    wallet_pass_usage_unit?: unknown;
+    /** Wallet Pass 本次使用值 */
+    wallet_pass_use_value?: string | number | null;
     /** 拓展参数字段 */
     metadata?: {
         /** 钱箱 ID */
@@ -227,13 +231,19 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    custom_payment_id: number;
+    custom_payment_id?: string | number;
+    /** 兼容旧调用方传入的支付方式 id */
+    id?: string | number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
+    /** Wallet Pass 使用单位配置 */
+    wallet_pass_usage_unit?: unknown;
+    /** Wallet Pass 本次使用值 */
+    wallet_pass_use_value?: string | number | null;
     /** 三方支付手续费 */
     service_charge?: {
         percentage?: string;

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Rules/index.js

@@ -105,12 +105,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       };
     }
     const filteredOldDiscountList = oldDiscountList.filter(
-      (discount) => !discount.isEditMode && discount.tag !== "good_pass"
-    );
-    const mergedDiscountList = (0, import_utils.uniqueById)(
-      (0, import_utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]),
-      "product_id"
+      (discount) => !discount.isEditMode && (discount.tag !== "good_pass" || discount.isScan)
     );
+    const mergedDiscountList = (0, import_utils.uniqueById)([
+      ...filteredOldDiscountList,
+      ...newDiscountList
+    ]);
     const result = this.calcDiscount(
       {
         discountList: mergedDiscountList,

package/lib/solution/ShopDiscount/index.js

@@ -322,7 +322,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop" && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

package/package.json

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