@pisell/pisellos 0.0.349 → 0.0.350

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

@@ -404,7 +404,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -447,7 +447,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
                 });
+              }); // 如果扫回来的券当前有选中的，则不进行计算
+              currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
+                return n.isSelected;
               });
+              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+                return withScanList.some(function (m) {
+                  return m.id === n.id;
+                });
+              }))) {
+                _context7.next = 16;
+                break;
+              }
+              return _context7.abrupt("return", {
+                type: "clientCalc",
+                isAvailable: true,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 16:
               _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
@@ -458,27 +476,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
-                _context7.next = 21;
+                _context7.next = 24;
                 break;
               }
               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')) {
-                _context7.next = 21;
+                _context7.next = 24;
                 break;
               }
-              _context7.next = 21;
+              _context7.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 21:
+            case 24:
               return _context7.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 24:
-              _context7.prev = 24;
+            case 27:
+              _context7.prev = 27;
               _context7.t1 = _context7["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context7.t1);
               return _context7.abrupt("return", {
@@ -487,11 +505,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 28:
+            case 31:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 24]]);
+        }, _callee7, this, [[0, 27]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);

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

@@ -270,6 +270,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
+      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
+      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
+        return {
+          type: "clientCalc",
+          isAvailable: true,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
       const {
         productList: newProductList,
         discountList: newDiscountList,

package/package.json

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