@pisell/pisellos 2.2.8 → 2.2.10

package/dist/modules/Payment/index.js

@@ -43,6 +43,21 @@ function formatAmount(amount) {
   }
 }
 
+/**
+ * 格式化日期时间为字符串
+ * 格式: YYYY-MM-DD HH:mm:ss
+ * 示例: 2025-12-10 16:14:50
+ */
+function formatDateTime(date) {
+  var year = date.getFullYear();
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var day = String(date.getDate()).padStart(2, '0');
+  var hours = String(date.getHours()).padStart(2, '0');
+  var minutes = String(date.getMinutes()).padStart(2, '0');
+  var seconds = String(date.getSeconds()).padStart(2, '0');
+  return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(hours, ":").concat(minutes, ":").concat(seconds);
+}
+
 /**
  * 生成请求唯一ID
  * 格式: 年月日时分秒毫秒+4位随机数
@@ -634,7 +649,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context6.prev = 0;
               _context6.next = 3;
-              return this.dbManager.get('order', orderUuid);
+              return this.dbManager.get('order', orderUuid, true);
             case 3:
               return _context6.abrupt("return", _context6.sent);
             case 6:
@@ -662,7 +677,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _createPaymentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(params) {
         var _this3 = this;
-        var newOrder, dbAddStartTime, dbAddDuration;
+        var newOrder, currentTime, dbAddStartTime, dbAddDuration;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -720,11 +735,45 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 tax_fee: '0.00',
                 is_deposit: params.is_deposit || 0,
                 deposit_amount: params.deposit_amount || '0.00'
-              }; // 🚀 性能监控：记录数据库添加操作耗时
+              }; // 🔧 新增: 处理云端已存在的支付项
+              if (params.existPayment && params.existPayment.length > 0) {
+                currentTime = formatDateTime(new Date());
+                newOrder.payment = params.existPayment.map(function (payment) {
+                  return _objectSpread(_objectSpread({}, payment), {}, {
+                    isSynced: true,
+                    // 标记为已同步
+                    status: payment.status || 'active',
+                    // 如果云端支付项已有时间戳，则保留；否则使用当前时间
+                    created_at: payment.created_at || currentTime,
+                    updated_at: payment.updated_at || currentTime
+                  });
+                });
+
+                // 重新计算待付金额
+                this.recalculateOrderAmount(newOrder);
+                this.logInfo('创建订单时包含云端支付项', {
+                  orderId: params.order_id,
+                  existPaymentCount: params.existPayment.length,
+                  totalAmount: newOrder.total_amount,
+                  expectAmount: newOrder.expect_amount,
+                  paymentDetails: params.existPayment.map(function (p) {
+                    return {
+                      uuid: p.uuid,
+                      code: p.code,
+                      amount: p.amount,
+                      status: p.status,
+                      created_at: p.created_at,
+                      updated_at: p.updated_at
+                    };
+                  })
+                });
+              }
+
+              // 🚀 性能监控：记录数据库添加操作耗时
               dbAddStartTime = Date.now();
-              _context7.next = 6;
-              return this.dbManager.add('order', newOrder);
-            case 6:
+              _context7.next = 7;
+              return this.dbManager.add('order', newOrder, true);
+            case 7:
               dbAddDuration = Date.now() - dbAddStartTime;
               this.logInfo('Database add operation completed', {
                 operation: 'dbManager.add',
@@ -738,19 +787,19 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 _this3.core.effects.emit("".concat(_this3.name, ":onOrderAdded"), newOrder);
               }, 0);
               return _context7.abrupt("return", newOrder);
-            case 12:
-              _context7.prev = 12;
+            case 13:
+              _context7.prev = 13;
               _context7.t0 = _context7["catch"](1);
               console.error('[PaymentModule] 创建支付订单失败', _context7.t0);
               this.logError('createPaymentOrderAsync failed', _context7.t0, {
                 orderId: params.order_id
               });
               throw _context7.t0;
-            case 17:
+            case 18:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[1, 12]]);
+        }, _callee7, this, [[1, 13]]);
       }));
       function createPaymentOrderAsync(_x6) {
         return _createPaymentOrderAsync.apply(this, arguments);
@@ -1054,7 +1103,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(orderUuid, paymentItem) {
-        var _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, newPaymentItem;
+        var _paymentItem$metadata, _newPaymentItem$metad, _newPaymentItem$metad2, _newPaymentItem$metad3, order, expectAmount, paidDepositAmount, expectedDepositAmount, warningMessage, paymentUuid, currentTime, newPaymentItem;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1065,16 +1114,23 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 orderPaymentType: paymentItem.order_payment_type
               });
               _context13.prev = 1;
-              _context13.next = 4;
+              this.logInfo('准备获取订单', {
+                orderUuid: orderUuid
+              });
+              _context13.next = 5;
               return this.getPaymentOrderByUuidAsync(orderUuid);
-            case 4:
+            case 5:
               order = _context13.sent;
+              this.logInfo('获取订单信息成功', {
+                orderUuid: orderUuid,
+                order: order
+              });
               if (order) {
-                _context13.next = 7;
+                _context13.next = 9;
                 break;
               }
               throw new Error("Order not found: ".concat(orderUuid));
-            case 7:
+            case 9:
               // 🔒 支付锁检查：如果订单待付金额已经为0，不允许继续添加支付项
               expectAmount = new Decimal(order.expect_amount);
               paidDepositAmount = order.payment.reduce(function (sum, payment) {
@@ -1085,7 +1141,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               expectedDepositAmount = new Decimal(order.deposit_amount || '0').sub(paidDepositAmount); // 有一种特殊情况,订单金额为 0，但是定金金额>0，且此时是定金状态的，允许添加支付项
               if (!(expectAmount.lte(0) && expectedDepositAmount.eq(0))) {
-                _context13.next = 15;
+                _context13.next = 17;
                 break;
               }
               warningMessage = "\u8BA2\u5355 ".concat(orderUuid, " \u5F85\u4ED8\u91D1\u989D\u5DF2\u4E3A0\uFF0C\u4E0D\u5141\u8BB8\u6DFB\u52A0\u65B0\u7684\u652F\u4ED8\u9879");
@@ -1102,11 +1158,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw new Error(warningMessage);
-            case 15:
-              paymentUuid = getUniqueId('payment_');
+            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_');
+              }
+              currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                id: paymentItem.id || 0,
+                custom_payment_id: paymentItem.custom_payment_id || 0,
                 name: paymentItem.name,
                 code: paymentItem.code,
                 type: paymentItem.type,
@@ -1118,6 +1179,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 // 新支付项默认为活跃状态
                 order_payment_type: paymentItem.order_payment_type || 'normal',
                 // 默认为正常支付
+                created_at: currentTime,
+                // 创建时间
+                updated_at: currentTime,
+                // 更新时间
                 metadata: _objectSpread(_objectSpread({}, paymentItem.metadata), {}, {
                   // 保留传入的所有 metadata 字段
                   unique_payment_number: paymentUuid // 设置唯一支付号为支付项的 uuid
@@ -1125,15 +1190,20 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               };
               order.payment.push(newPaymentItem);
               this.recalculateOrderAmount(order);
-              _context13.next = 21;
-              return this.dbManager.update('order', order);
-            case 21:
-              _context13.next = 23;
-              return this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
+              this.logInfo('开始更新订单支付项', {
+                orderUuid: orderUuid,
+                order: order
+              });
+              _context13.next = 25;
+              return this.dbManager.update('order', order, true);
+            case 25:
+              this.logInfo('更新订单支付项完成', {
+                orderUuid: orderUuid
+              });
+              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });
-            case 23:
               this.logInfo('addPaymentItemAsync completed successfully', {
                 orderUuid: orderUuid,
                 paymentUuid: newPaymentItem.uuid,
@@ -1147,10 +1217,10 @@ 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
               });
-              _context13.next = 31;
+              _context13.next = 35;
               break;
-            case 26:
-              _context13.prev = 26;
+            case 30:
+              _context13.prev = 30;
               _context13.t0 = _context13["catch"](1);
               console.error('[PaymentModule] 添加支付项失败', _context13.t0);
               this.logError('addPaymentItemAsync failed', _context13.t0, {
@@ -1158,11 +1228,11 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                 paymentItem: paymentItem
               });
               throw _context13.t0;
-            case 31:
+            case 35:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[1, 26]]);
+        }, _callee13, this, [[1, 30]]);
       }));
       function addPaymentItemAsync(_x14, _x15) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -1624,7 +1694,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                     uuid: payment.uuid,
                     amount: payment.amount,
                     code: payment.code,
-                    id: payment.id,
+                    custom_payment_id: payment.custom_payment_id,
                     name: payment.name,
                     type: payment.type,
                     voucher_id: payment.voucher_id,

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

@@ -96,7 +96,7 @@ export interface PaymentItem {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -138,6 +138,10 @@ export interface PaymentItem {
         statusCode?: number;
         timestamp: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    updated_at?: string;
 }
 /**
  * 订单信息
@@ -200,6 +204,8 @@ export interface PushOrderParams {
     deposit_amount?: string;
     /** 原始订单数据（可选，由 Checkout 模块传入） */
     order_info?: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 更新订单参数
@@ -219,7 +225,7 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -248,6 +254,10 @@ export interface PaymentItemInput {
         /** 找零金额（现金支付时的找零金额） */
         change_given_amount?: number;
     };
+    /** 支付项创建时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    created_at?: string;
+    /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
+    updated_at?: string;
 }
 /**
  * 推送支付项参数
@@ -598,6 +608,8 @@ export interface WalletDeductionRecommendParams {
     expect_columns?: string[];
     /** 客户id */
     customer_id?: number;
+    /** 客户holder_id */
+    holder_id?: number;
     /** 订单总计金额 */
     order_expect_amount: number;
     /** 订单小计金额 */
@@ -616,6 +628,8 @@ export interface WalletDeductionRecommendParams {
         quantity: number;
         /** 商品使用了所有优惠后的最终价格 */
         selling_price: number;
+        /** 客户holder_id */
+        holder_id?: number;
     }[];
     /** 预备支付 */
     prepare_payments?: {
@@ -633,6 +647,10 @@ export interface WalletDeductionRecommendParams {
 export interface WalletInitBusinessData {
     /** 客户ID（可选） */
     customer_id?: number;
+    /** 客户 holder */
+    holder?: {
+        form_record: number[];
+    };
     /** 金额信息 */
     amountInfo: {
         totalAmount: string;
@@ -648,10 +666,12 @@ export interface WalletInitBusinessData {
         product_variant_id: string;
         quantity: number;
         selling_price: number;
+        holder_id?: number;
     }[];
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/dist/modules/Payment/walletpass.js

@@ -58,20 +58,24 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
   }, {
     key: "generateWalletParams",
     value: function generateWalletParams(businessData) {
-      var _walletParams$product;
+      var _holder$form_record, _walletParams$product;
       var customer_id = businessData.customer_id,
+        holder = businessData.holder,
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
-        payment_order_id = businessData.payment_order_id;
+        payment_order_id = businessData.payment_order_id,
+        is_price_include_tax = businessData.is_price_include_tax;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
       var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
+        is_price_include_tax: is_price_include_tax,
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number
+        holder_id: (holder === null || holder === void 0 || (_holder$form_record = holder.form_record) === null || _holder$form_record === void 0 ? void 0 : _holder$form_record[0]) || undefined,
         order_expect_amount: totalAmount,
         // 订单小计金额
         order_product_amount: subTotal,
@@ -87,6 +91,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
       this.walletParams = walletParams;
       this.paymentModule.logInfo('[WalletPass] 钱包默认参数已生成并存储', {
         customer_id: walletParams.customer_id,
+        holder_id: walletParams.holder_id,
         order_expect_amount: walletParams.order_expect_amount,
         order_product_amount: walletParams.order_product_amount,
         order_wait_pay_amount: walletParams.order_wait_pay_amount,
@@ -563,7 +568,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               paymentItem = {
                 amount: amount.toString(),
                 code: walletMethod.code,
-                id: walletMethod.id,
+                custom_payment_id: walletMethod.id,
                 name: walletMethod.name,
                 type: walletMethod.type,
                 voucher_id: voucherId || ''

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/ProductList/index.js

@@ -140,17 +140,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              });
-              if (sortedList.length) {
-                sortedList.forEach(function (n) {
-                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-                    n.is_eject = 1;
-                  }
-                });
-              }
+              }); // if (sortedList.length) {
+              //   sortedList.forEach((n: any) => {
+              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+              //       n.is_eject = 1
+              //     }
+              //   })
+              // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 11:
+            case 10:
             case "end":
               return _context3.stop();
           }

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

@@ -12,24 +12,38 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, }: {
+    private checkHolderMatch;
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, }: {
+    calcDiscount({ discountList, productList, holders, }: {
         discountList: Discount[];
         productList: any[];
+        holders: {
+            form_record_id: number;
+        }[];
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
         selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
+    /**
+     * 检查优惠是否符合 PackageSubItemUsageRules 配置
+     * @param discount 优惠券
+     * @param flatItem 扁平化后的商品项（可能是主商品或bundle子商品）
+     * @returns 是否可用
+     */
+    private checkPackageSubItemUsageRules;
     destroy(): Promise<void>;
     clear(): Promise<void>;
 }