@pisell/pisellos 2.2.131 → 2.2.133

package/dist/core/index.js

@@ -45,7 +45,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('initialize123');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

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),
@@ -2006,8 +2007,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 套餐适用范围校验
             var isScopeValid = false;
 
-            // 排除套餐判断
-            if (scopeType === 'all_packages') {
+            // 排除套餐判断, product_all值兼容旧数据
+            if (scopeType === 'all_packages' || scopeType === 'product_all') {
               // 所有套餐可用
               if (!filter) {
                 isScopeValid = true;
@@ -2016,8 +2017,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
 
-            // 包含套餐判断
-            if (scopeType === 'specific_packages') {
+            // 包含套餐判断, products值兼容旧数据
+            if (scopeType === 'specific_packages' || scopeType === 'products') {
               isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 

package/dist/server/index.d.ts

@@ -166,6 +166,11 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * 按商品 id 查询单条（GET /shop/product/query/:productId）
+     * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。
+     */
+    private handleProductQueryById;
     /**
      * 取消商品查询订阅（HTTP 路由入口）
      */