@pisell/pisellos 0.0.224 → 0.0.226

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

@@ -8,6 +8,7 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultVersion: string;
     private store;
     private request;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;

package/dist/modules/ProductList/index.js

@@ -31,6 +31,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     return _this;
   }
   _createClass(ProductList, [{
@@ -43,6 +44,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.core = core;
               this.store = options.store;
+              this.otherParams = options.otherParams || {};
               if (Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list;
                 this.core.effects.emit("".concat(this.name, ":changed"), this.store.list);
@@ -53,7 +55,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.selectProducts = [];
               }
               this.request = core.getPlugin('request');
-            case 4:
+            case 5:
             case "end":
               return _context.stop();
           }
@@ -100,6 +102,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+        var _this$otherParams;
         var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -124,8 +127,9 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               } catch (error) {
                 console.error(error);
               }
+              debugger;
               // 如果没传schedule_date，则从
-              _context3.next = 6;
+              _context3.next = 7;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
@@ -144,15 +148,16 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
                 with_schedule: with_schedule,
-                schedule_datetime: schedule_datetime
+                schedule_datetime: schedule_datetime,
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel
               }, {
                 useCache: true
               });
-            case 6:
+            case 7:
               productsData = _context3.sent;
               this.addProduct(productsData.data.list);
               return _context3.abrupt("return", productsData.data.list);
-            case 9:
+            case 10:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -297,19 +297,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 记录可抵扣的商品详情
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
-            applicableProducts.push({
+            var discountType = discount.tag || discount.type;
+            var productData = {
               amount: product.price,
-              type: discount.tag || discount.type,
-              tag: discount.tag || discount.type,
+              type: discountType,
+              tag: discountType,
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
                 pre_value: discount.par_value,
                 product_id: originProduct.id
-              },
-              num: product.num || 1
-            });
+              }
+            };
+
+            // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
+            if (discountType !== 'good_pass') {
+              productData.num = product.num || 1;
+            }
+            applicableProducts.push(productData);
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
         });
@@ -451,18 +457,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
           var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
+          var discountType = _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag;
           var discountDetail = {
             amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
-            type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
+            type: discountType,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
               original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
-            },
-            num: product.num || 1
+            }
           };
+
+          // 如果 discount.tag 或者 discount.type 是 good_pass，则不需要添加 num 属性
+          if ((_selectedDiscount.tag || _selectedDiscount.type) !== 'good_pass') {
+            discountDetail.num = product.num || 1;
+          }
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
 

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

@@ -8,6 +8,7 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultVersion: string;
     private store;
     private request;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;

package/lib/modules/ProductList/index.js

@@ -33,11 +33,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "productList";
     this.defaultVersion = "1.0.0";
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a;
     this.core = core;
     this.store = options.store;
+    this.otherParams = options.otherParams || {};
     if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
       this.store.list = options.initialState.list;
       this.core.effects.emit(`${this.name}:changed`, this.store.list);
@@ -76,7 +78,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule
   }) {
-    var _a;
+    var _a, _b;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -84,6 +86,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
+    debugger;
     const productsData = await this.request.post(
       `/product/query`,
       {
@@ -111,7 +114,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         // client_schedule_ids: schedule_ids,
         schedule_date,
         with_schedule,
-        schedule_datetime
+        schedule_datetime,
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
       },
       { useCache: true }
     );

package/lib/modules/Rules/index.js

@@ -189,19 +189,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
-          applicableProducts.push({
+          const discountType = discount.tag || discount.type;
+          const productData = {
             amount: product.price,
-            type: discount.tag || discount.type,
-            tag: discount.tag || discount.type,
+            type: discountType,
+            tag: discountType,
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
               pre_value: discount.par_value,
               product_id: originProduct.id
-            },
-            num: product.num || 1
-          });
+            }
+          };
+          if (discountType !== "good_pass") {
+            productData.num = product.num || 1;
+          }
+          applicableProducts.push(productData);
           discountApplicableProducts.set(discount.id, applicableProducts);
         }
       });
@@ -310,18 +314,21 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
+        const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
         const discountDetail = {
           amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
-          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          type: discountType,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
             original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
-          },
-          num: product.num || 1
+          }
         };
+        if ((selectedDiscount2.tag || selectedDiscount2.type) !== "good_pass") {
+          discountDetail.num = product.num || 1;
+        }
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {

package/package.json

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