@pisell/pisellos 2.2.172 → 2.2.174

package/dist/solution/BaseSales/index.js

@@ -64,6 +64,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     // 当前缓存中已加载的最新 SalesDetail；只读 getter 走它对外暴露详情数据。
     _defineProperty(_assertThisInitialized(_this), "currentSalesDetail", null);
+    _defineProperty(_assertThisInitialized(_this), "discountConfigCacheKey", null);
+    _defineProperty(_assertThisInitialized(_this), "hasManualDiscountSelection", false);
     return _this;
   }
 
@@ -678,14 +680,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       return this.store.order.updateTempOrderContactsInfo(contactsInfo);
     }
 
-    /**
-     * 运行时切换 tempOrder 是否写入 localStorage（委托 OrderModule）。
-     * SalesSdk 等内存态场景可在挂载后设为 false，避免污染本地缓存。
-     *
-     * @example
-     * bookingTicket.setEnableTempOrderPersist(false);
-     * await bookingTicket.addProductToOrder(product);
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   }, {
     key: "setEnableTempOrderPersist",
     value: function setEnableTempOrderPersist(enabled) {
@@ -693,18 +688,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       this.store.order.setEnableTempOrderPersist(enabled);
     }
 
-    /**
-     * 读取当前 tempOrder localStorage 持久化开关（委托 OrderModule）。
-     *
-     * @example
-     * if (bookingTicket.isTempOrderPersistEnabled()) {
-     *   bookingTicket.restoreOrder();
-     * }
-     */
+    /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   }, {
     key: "isTempOrderPersistEnabled",
     value: function isTempOrderPersistEnabled() {
-      if (!this.store.order) return true;
+      if (!this.store.order) return false;
       return this.store.order.isTempOrderPersistEnabled();
     }
   }, {
@@ -802,29 +790,31 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               // this.store.resource = null;
               tempOrder = this.store.order.restoreOrder();
               this.currentSalesDetail = null;
-              _context8.next = 7;
+              this.discountConfigCacheKey = null;
+              this.hasManualDiscountSelection = false;
+              _context8.next = 9;
               return this.effectsEmit('onTempOrderReplaced', {
                 tempOrder: tempOrder
               });
-            case 7:
+            case 9:
               if (!this.syncAppDataToTempOrder(tempOrder)) {
-                _context8.next = 11;
+                _context8.next = 13;
                 break;
               }
               this.store.order.persistTempOrder();
-              _context8.next = 11;
+              _context8.next = 13;
               return this.store.order.saveDraft();
-            case 11:
+            case 13:
               return _context8.abrupt("return", tempOrder);
-            case 14:
-              _context8.prev = 14;
+            case 16:
+              _context8.prev = 16;
               _context8.t0 = _context8["catch"](0);
               throw _context8.t0;
-            case 17:
+            case 19:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 14]]);
+        }, _callee8, this, [[0, 16]]);
       }));
       function restoreOrder() {
         return _restoreOrder.apply(this, arguments);
@@ -1025,8 +1015,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadDiscountConfig",
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(params) {
-        var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, preparedDiscountList, _discountModule$setOr, nextDiscountList, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result;
+        var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata, _tempOrder$_extend3, _product$metadata2, _product$metadata$sou, _product$metadata3, _product$metadata4, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1043,30 +1033,54 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderId = tempOrder.order_id || ((_this$getOrderIdentit = this.getOrderIdentity) === null || _this$getOrderIdentit === void 0 || (_this$getOrderIdentit = _this$getOrderIdentit.call(this)) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId);
               customerId = Number((params === null || params === void 0 ? void 0 : params.customerId) || tempOrder.customer_id || ((_tempOrder$customer = tempOrder.customer) === null || _tempOrder$customer === void 0 ? void 0 : _tempOrder$customer.id) || ((_tempOrder$_extend = tempOrder._extend) === null || _tempOrder$_extend === void 0 || (_tempOrder$_extend = _tempOrder$_extend.customerSnapshot) === null || _tempOrder$_extend === void 0 ? void 0 : _tempOrder$_extend.id) || ((_tempOrder$_extend2 = tempOrder._extend) === null || _tempOrder$_extend2 === void 0 || (_tempOrder$_extend2 = _tempOrder$_extend2.customerSnapshot) === null || _tempOrder$_extend2 === void 0 ? void 0 : _tempOrder$_extend2.customer_id) || 0);
               currentDiscountList = (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [];
+              originalDiscountList = (discountModule === null || discountModule === void 0 || (_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || [];
+              hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some(function (discount) {
+                return discount.isManualSelect;
+              });
+              discountAction = (params === null || params === void 0 ? void 0 : params.action) || (orderId ? 'edit' : 'create');
+              discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
               preparedDiscountList = [];
               if (!(customerId && customerId !== 1)) {
-                _context11.next = 16;
+                _context11.next = 25;
+                break;
+              }
+              if (!(this.discountConfigCacheKey === discountConfigCacheKey)) {
+                _context11.next = 19;
                 break;
               }
-              _context11.next = 13;
+              preparedDiscountList = originalDiscountList;
+              _context11.next = 25;
+              break;
+            case 19:
+              _context11.next = 21;
               return this.store.order.loadDiscountConfig({
                 customerId: customerId,
-                action: (params === null || params === void 0 ? void 0 : params.action) || (orderId ? 'edit' : 'create'),
+                action: discountAction,
                 orderId: Number(orderId) || undefined,
                 apply: false
               });
-            case 13:
+            case 21:
               preparedDiscountList = _context11.sent;
-              _context11.next = 16;
+              this.discountConfigCacheKey = discountConfigCacheKey;
+              _context11.next = 25;
               return discountModule === null || discountModule === void 0 || (_discountModule$setOr = discountModule.setOriginalDiscountList) === null || _discountModule$setOr === void 0 ? void 0 : _discountModule$setOr.call(discountModule, preparedDiscountList);
-            case 16:
+            case 25:
+              if (!(hasManualDiscountSelection && currentDiscountList.length)) {
+                _context11.next = 27;
+                break;
+              }
+              return _context11.abrupt("return", {
+                productList: tempOrder.products || [],
+                discountList: currentDiscountList
+              });
+            case 27:
               nextDiscountList = this.mergeHistoricalDiscountList(preparedDiscountList || (discountModule === null || discountModule === void 0 || (_discountModule$getDi2 = discountModule.getDiscountList) === null || _discountModule$getDi2 === void 0 ? void 0 : _discountModule$getDi2.call(discountModule)) || [], tempOrder.products || []);
               nextDiscountList = this.mergeCurrentDiscountSelectionState(nextDiscountList, currentDiscountList);
-              _context11.next = 20;
+              _context11.next = 31;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 20:
+            case 31:
               if (!rulesModule) {
-                _context11.next = 30;
+                _context11.next = 67;
                 break;
               }
               holders = (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
@@ -1085,37 +1099,90 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               if (result.productList) {
                 tempOrder.products = result.productList;
               }
+              _iterator = _createForOfIteratorHelper(tempOrder.products || []);
+              _context11.prev = 36;
+              _iterator.s();
+            case 38:
+              if ((_step = _iterator.n()).done) {
+                _context11.next = 53;
+                break;
+              }
+              product = _step.value;
+              productUid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
+              runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.is_manual_discount)) {
+                _context11.next = 44;
+                break;
+              }
+              return _context11.abrupt("continue", 51);
+            case 44:
+              totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
+                return sum + Number(pd.amount || 0);
+              }, 0);
+              optionSum = sumOptionUnitPrice(product.product_option_item);
+              sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+              newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+              newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
+              if (product.metadata) {
+                product.metadata.main_product_selling_price = newMainSellingPrice;
+                product.metadata.price_schema_version = 2;
+              }
+              product.selling_price = composeLinePrice({
+                mainPrice: newMainSellingPrice,
+                bundle: product.product_bundle
+              });
+            case 51:
+              _context11.next = 38;
+              break;
+            case 53:
+              _context11.next = 58;
+              break;
+            case 55:
+              _context11.prev = 55;
+              _context11.t0 = _context11["catch"](36);
+              _iterator.e(_context11.t0);
+            case 58:
+              _context11.prev = 58;
+              _iterator.f();
+              return _context11.finish(58);
+            case 61:
               if (!result.discountList) {
-                _context11.next = 30;
+                _context11.next = 67;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context11.next = 29;
+              _context11.next = 66;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 29:
+            case 66:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 30:
+            case 67:
+              _context11.next = 69;
+              return this.store.order.recalculateSummary({
+                createIfMissing: true
+              });
+            case 69:
+              summary = _context11.sent;
               this.store.order.persistTempOrder();
-              _context11.next = 33;
+              _context11.next = 73;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 33:
+            case 73:
               return _context11.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               });
-            case 34:
+            case 74:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this);
+        }, _callee11, this, [[36, 55, 58, 61]]);
       }));
       function loadDiscountConfig(_x5) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -1126,8 +1193,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "bestDiscount",
     value: function () {
       var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(cb) {
-        var _discountModule$getOr;
-        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, nextDiscountList, result, _tempOrder$holder3, _tempOrder$holder4, _orderStore$summary2, holders;
+        var _discountModule$getOr2, _discountModule$getDi3;
+        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder3, _tempOrder$holder4, _orderStore$summary2, holders;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1141,17 +1208,18 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               rulesModule = orderStore.rules;
-              originalDiscountList = (discountModule === null || discountModule === void 0 || (_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || this.getDiscountList();
+              originalDiscountList = (discountModule === null || discountModule === void 0 || (_discountModule$getOr2 = discountModule.getOriginalDiscountList) === null || _discountModule$getOr2 === void 0 ? void 0 : _discountModule$getOr2.call(discountModule)) || this.getDiscountList();
+              currentDiscountList = (discountModule === null || discountModule === void 0 || (_discountModule$getDi3 = discountModule.getDiscountList) === null || _discountModule$getDi3 === void 0 ? void 0 : _discountModule$getDi3.call(discountModule)) || [];
               nextDiscountList = this.mergeHistoricalDiscountList(originalDiscountList || [], tempOrder.products || []);
               result = {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               };
-              _context12.next = 11;
+              _context12.next = 12;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 11:
+            case 12:
               if (!rulesModule) {
-                _context12.next = 22;
+                _context12.next = 23;
                 break;
               }
               holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
@@ -1168,14 +1236,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = result.productList;
               }
               if (!result.discountList) {
-                _context12.next = 22;
+                _context12.next = 23;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context12.next = 20;
+              _context12.next = 21;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 20:
+            case 21:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -1183,16 +1251,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 22:
-              _context12.next = 24;
+            case 23:
+              _context12.next = 25;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 24:
+            case 25:
               this.store.order.persistTempOrder();
               cb === null || cb === void 0 || cb(result);
               return _context12.abrupt("return", result);
-            case 27:
+            case 28:
             case "end":
               return _context12.stop();
           }
@@ -1263,7 +1331,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(params) {
-        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator, _step, d, selectedResourceIds, _iterator2, _step2, _product$metadata, _tempOrder$_extend3, _product$metadata2, _product$metadata$sou, _product$metadata3, _product$metadata4, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata5, _tempOrder$_extend4, _product$metadata6, _product$metadata$sou2, _product$metadata7, _product$metadata8, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1281,6 +1349,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   isManualSelect: !params.isSelected
                 }) : d;
               });
+              this.hasManualDiscountSelection = true;
               tempOrder = this.store.order.ensureTempOrder();
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
@@ -1289,9 +1358,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 form_record_id: tempOrder.holder.form_record_id
               }] : [];
               nextDiscountList = updated;
-              _context14.next = 13;
+              _context14.next = 14;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
-            case 13:
+            case 14:
               if (rulesModule) {
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
@@ -1316,18 +1385,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                     }).map(function (d) {
                       return d.id;
                     }));
-                    _iterator = _createForOfIteratorHelper(nextDiscountList);
+                    _iterator2 = _createForOfIteratorHelper(nextDiscountList);
                     try {
-                      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                        d = _step.value;
+                      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                        d = _step2.value;
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
+                          d.isManualSelect = true;
                         }
                       }
                     } catch (err) {
-                      _iterator.e(err);
+                      _iterator2.e(err);
                     } finally {
-                      _iterator.f();
+                      _iterator2.f();
                     }
                   }
                 }
@@ -1337,23 +1407,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }).map(function (d) {
                 return d.id;
               }));
-              _iterator2 = _createForOfIteratorHelper(tempOrder.products);
-              _context14.prev = 16;
-              _iterator2.s();
-            case 18:
-              if ((_step2 = _iterator2.n()).done) {
-                _context14.next = 34;
+              _iterator3 = _createForOfIteratorHelper(tempOrder.products);
+              _context14.prev = 17;
+              _iterator3.s();
+            case 19:
+              if ((_step3 = _iterator3.n()).done) {
+                _context14.next = 35;
                 break;
               }
-              product = _step2.value;
-              productUid = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.unique_identification_number;
-              runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
-              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.is_manual_discount)) {
-                _context14.next = 24;
+              product = _step3.value;
+              productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
+              runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata6 = product.metadata) !== null && _product$metadata6 !== void 0 && _product$metadata6.is_manual_discount)) {
+                _context14.next = 25;
                 break;
               }
-              return _context14.abrupt("continue", 32);
-            case 24:
+              return _context14.abrupt("continue", 33);
+            case 25:
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
                 var rid = (_pd$discount$resource = (_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) !== null && _pd$discount$resource !== void 0 ? _pd$discount$resource : pd.id;
@@ -1366,7 +1436,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum + (pd.amount || 0);
               }, 0); // TODO 这块逻辑需要拿掉
               optionSum = sumOptionUnitPrice(product.product_option_item);
-              sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+              sourcePrice = (_product$metadata$sou2 = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.source_product_price) !== null && _product$metadata$sou2 !== void 0 ? _product$metadata$sou2 : ((_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
@@ -1377,33 +1447,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 32:
-              _context14.next = 18;
+            case 33:
+              _context14.next = 19;
               break;
-            case 34:
-              _context14.next = 39;
+            case 35:
+              _context14.next = 40;
               break;
-            case 36:
-              _context14.prev = 36;
-              _context14.t0 = _context14["catch"](16);
-              _iterator2.e(_context14.t0);
-            case 39:
-              _context14.prev = 39;
-              _iterator2.f();
-              return _context14.finish(39);
-            case 42:
+            case 37:
+              _context14.prev = 37;
+              _context14.t0 = _context14["catch"](17);
+              _iterator3.e(_context14.t0);
+            case 40:
+              _context14.prev = 40;
+              _iterator3.f();
+              return _context14.finish(40);
+            case 43:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context14.next = 45;
+              _context14.next = 46;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 45:
+            case 46:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context14.next = 48;
+              _context14.next = 49;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 48:
+            case 49:
               this.store.order.persistTempOrder();
               this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products,
@@ -1411,17 +1481,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 selectedDiscountList: tempOrder.discount_list,
                 tempOrder: tempOrder
               });
-              _context14.next = 55;
+              _context14.next = 56;
               break;
-            case 52:
-              _context14.prev = 52;
+            case 53:
+              _context14.prev = 53;
               _context14.t1 = _context14["catch"](0);
               throw _context14.t1;
-            case 55:
+            case 56:
             case "end":
               return _context14.stop();
           }
-        }, _callee14, this, [[0, 52], [16, 36, 39, 42]]);
+        }, _callee14, this, [[0, 53], [17, 37, 40, 43]]);
       }));
       function setDiscountSelected(_x9) {
         return _setDiscountSelected.apply(this, arguments);
@@ -1701,10 +1771,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order3, _tempOrder$products;
+      var _this$store$order3, _tempOrder$products, _tempOrder$products2;
       var tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
-      return tempOrder.products.map(function (product) {
+      // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
+      var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
+        return n.product_id;
+      });
+      return products.map(function (product) {
         var _product$product_vari, _product$is_charge_ta, _product$holder_id, _metadata$main_produc, _metadata$main_produc2;
         var metadata = product.metadata || {};
         return {

package/dist/solution/BaseSales/types.d.ts

@@ -243,6 +243,19 @@ export interface BaseSalesProductBookingPriceSegment {
     quotation_shelf_id: number;
     source: BaseSalesProductBookingPriceSegmentSource;
 }
+export interface BaseSalesBundleProductBookingPriceResult {
+    bundle_id?: number;
+    group_id?: number;
+    bundle_group_id?: number;
+    bundle_product_id: number | null;
+    bundle_variant_id: number;
+    unit_price: string;
+    total_price: string;
+    quantity: number;
+    quotation_shelf_id: number;
+    source: BaseSalesProductBookingPriceSegmentSource;
+    segments: BaseSalesProductBookingPriceSegment[];
+}
 export interface BaseSalesProductBookingPriceResult {
     product_id: number | null;
     product_variant_id: number;
@@ -253,6 +266,7 @@ export interface BaseSalesProductBookingPriceResult {
     duration?: BaseSalesQuotationDurationConfig;
     quotation_shelf_id: number;
     segments: BaseSalesProductBookingPriceSegment[];
+    product_bundle?: BaseSalesBundleProductBookingPriceResult[];
 }
 export type BaseSalesAvailabilityMode = 'idle' | 'shop_closed' | 'submit_disabled' | 'resource_busy' | 'additional_order_with_code' | 'additional_order';
 export interface BaseSalesTableFormRecord {