@pisell/pisellos 0.0.34 → 0.0.35

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

@@ -47,6 +47,7 @@ export interface Discount {
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
+    isScan?: boolean;
     discount?: {
         resource_id: number;
     };

package/dist/solution/ShopDiscount/index.js

@@ -301,7 +301,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code) {
-        var _this$store$discount3, resultDiscountList, rulesModule, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -328,35 +328,40 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               });
             case 10:
+              withScanList = resultDiscountList.map(function (item) {
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  isScan: true
+                });
+              });
               _ref3 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
-                newDiscountList: resultDiscountList
+                newDiscountList: withScanList
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 17;
+                _context5.next = 18;
                 break;
               }
               this.setDiscountList(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')) {
-                _context5.next = 17;
+                _context5.next = 18;
                 break;
               }
-              _context5.next = 17;
+              _context5.next = 18;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 17:
+            case 18:
               return _context5.abrupt("return", {
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 20:
-              _context5.prev = 20;
+            case 21:
+              _context5.prev = 21;
               _context5.t1 = _context5["catch"](0);
               console.error("[ShopDiscount] 扫码出错:", _context5.t1);
               return _context5.abrupt("return", {
@@ -364,11 +369,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 24:
+            case 25:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 20]]);
+        }, _callee5, this, [[0, 21]]);
       }));
       function scanCode(_x4) {
         return _scanCode.apply(this, arguments);
@@ -503,7 +508,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$store$productLi, customerId, goodPassList, result;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, newDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -519,29 +524,33 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 4:
               goodPassList = _context8.sent;
-              this.setDiscountList(goodPassList || []);
+              scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
+                return item.isScan;
+              });
+              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(goodPassList || []));
+              this.setDiscountList(newDiscountList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 10;
+                _context8.next = 12;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 10;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 10:
               _context8.next = 12;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, goodPassList);
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
             case 12:
-              _context8.next = 17;
-              break;
+              _context8.next = 14;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
             case 14:
-              _context8.prev = 14;
+              _context8.next = 19;
+              break;
+            case 16:
+              _context8.prev = 16;
               _context8.t0 = _context8["catch"](0);
               console.error("[ShopDiscount] 加载准备配置出错:", _context8.t0);
-            case 17:
+            case 19:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 14]]);
+        }, _callee8, this, [[0, 16]]);
       }));
       function loadPrepareConfig(_x7) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -47,6 +47,7 @@ export interface Discount {
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
+    isScan?: boolean;
     discount?: {
         resource_id: number;
     };

package/lib/solution/ShopDiscount/index.js

@@ -197,6 +197,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           discountList: this.getDiscountList()
         };
       }
+      const withScanList = resultDiscountList.map((item) => {
+        return {
+          ...item,
+          isScan: true
+        };
+      });
       const {
         productList: newProductList,
         discountList: newDiscountList,
@@ -204,7 +210,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
-        newDiscountList: resultDiscountList
+        newDiscountList: withScanList
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -308,7 +314,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 加载准备配置
   async loadPrepareConfig(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
@@ -316,8 +322,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1
       }));
-      this.setDiscountList(goodPassList || []);
-      if ((_c = this.store.productList) == null ? void 0 : _c.length) {
+      const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter((item) => item.isScan);
+      const newDiscountList = [...scanDiscount, ...goodPassList || []];
+      this.setDiscountList(newDiscountList || []);
+      if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
           import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
@@ -326,7 +334,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         import_types.ShopDiscountHooks.onLoadDiscountList,
-        goodPassList
+        newDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

package/package.json

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