@pisell/pisellos 0.0.151 → 0.0.152

package/dist/modules/Rules/index.js

@@ -149,6 +149,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList;
+      // debugger
+
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = productList.find(function (n) {
+        return n.booking_id;
+      }) && productList.find(function (n) {
+        return !n.booking_id;
+      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -370,7 +379,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
           return;
         }
 

package/dist/solution/ShopDiscount/index.d.ts

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
+        type: "server" | "clientCalc";
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/dist/solution/ShopDiscount/index.js

@@ -327,11 +327,23 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
             case 10:
+              if (resultDiscountList.length) {
+                _context5.next = 12;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "server",
+                isAvailable: false,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 12:
               withScanList = resultDiscountList.map(function (item) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
@@ -347,37 +359,39 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 18;
+                _context5.next = 20;
                 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 = 18;
+                _context5.next = 20;
                 break;
               }
-              _context5.next = 18;
+              _context5.next = 20;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 18:
+            case 20:
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 21:
-              _context5.prev = 21;
+            case 23:
+              _context5.prev = 23;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
+                type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 25:
+            case 27:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 21]]);
+        }, _callee5, this, [[0, 23]]);
       }));
       function scanCode(_x4) {
         return _scanCode.apply(this, arguments);

package/lib/modules/Rules/index.js

@@ -105,6 +105,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList
   }, options) {
+    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -262,7 +263,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
         return;
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";

package/lib/solution/ShopDiscount/index.d.ts

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         isAvailable: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
+        type: "server" | "clientCalc";
     }>;
     calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     private getCustomer;

package/lib/solution/ShopDiscount/index.js

@@ -205,6 +205,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
+          type: "clientCalc",
+          isAvailable: false,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
+      if (!resultDiscountList.length) {
+        return {
+          type: "server",
           isAvailable: false,
           productList: this.store.productList || [],
           discountList: this.getDiscountList()
@@ -239,6 +248,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         }
       }
       return {
+        type: "clientCalc",
         isAvailable: isAvailable || false,
         productList: newProductList || this.store.productList || [],
         discountList: newDiscountList || this.getDiscountList()
@@ -246,6 +256,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error("[ShopDiscount] 扫码出错:", error);
       return {
+        type: "clientCalc",
         isAvailable: false,
         productList: this.store.productList || [],
         discountList: this.getDiscountList()

package/package.json

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