@pisell/pisellos 2.3.6 → 2.3.8

package/dist/solution/BaseSales/index.js

@@ -36,7 +36,7 @@ import { OrderModule } from "../../modules/Order";
 import Decimal from 'decimal.js';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { createModule } from "../BookingByStep/types";
-import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, createUuidV4, ensureProductSku, getProductSkuOptions, resolveIsFormSubject, sumOptionUnitPrice } from "../../modules/Order/utils";
 import dayjs from 'dayjs';
 export * from "./types";
 import { QuotationModule } from "../../modules/Quotation";
@@ -168,9 +168,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getReusableSharedSubModule",
     value: function getReusableSharedSubModule(moduleName) {
-      var _this$core;
+      var _this$core, _this$core$getModule;
       if (moduleName !== 'schedule' && moduleName !== 'quotation') return null;
-      return ((_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.getModule(moduleName)) || null;
+      return ((_this$core = this.core) === null || _this$core === void 0 || (_this$core$getModule = _this$core.getModule) === null || _this$core$getModule === void 0 ? void 0 : _this$core$getModule.call(_this$core, moduleName)) || null;
     }
   }, {
     key: "isScheduleListLoaded",
@@ -1489,7 +1489,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
         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, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _orderStore$summary, holders, orderTotalAmount, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1583,18 +1583,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 40:
               if (!rulesModule) {
-                _context15.next = 76;
+                _context15.next = 78;
                 break;
               }
-              holders = (_tempOrder$holder = tempOrder.holder) !== null && _tempOrder$holder !== void 0 && _tempOrder$holder.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.form_record) || [];
+              orderTotalAmount = Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0);
+              console.log('[BaseSales.applyDiscountConfig.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
                 holders: holders,
-                isFormSubject: !!((_tempOrder$holder2 = tempOrder.holder) !== null && _tempOrder$holder2 !== void 0 && _tempOrder$holder2.type) && tempOrder.holder.type === 'form',
-                orderTotalAmount: Number(((_orderStore$summary = orderStore.summary) === null || _orderStore$summary === void 0 ? void 0 : _orderStore$summary.total_amount) || 0)
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                },
+                orderTotalAmount: orderTotalAmount
               }) || {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
@@ -1603,22 +1605,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
-              _context15.prev = 45;
+              _context15.prev = 47;
               _iterator.s();
-            case 47:
+            case 49:
               if ((_step = _iterator.n()).done) {
-                _context15.next = 62;
+                _context15.next = 64;
                 break;
               }
               product = _step.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.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 || isBaseSalesManualProductDiscountProduct(product))) {
-                _context15.next = 53;
+                _context15.next = 55;
                 break;
               }
-              return _context15.abrupt("continue", 60);
-            case 53:
+              return _context15.abrupt("continue", 62);
+            case 55:
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + Number(pd.amount || 0);
               }, 0);
@@ -1634,58 +1636,58 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 60:
-              _context15.next = 47;
-              break;
             case 62:
-              _context15.next = 67;
+              _context15.next = 49;
               break;
             case 64:
-              _context15.prev = 64;
-              _context15.t0 = _context15["catch"](45);
+              _context15.next = 69;
+              break;
+            case 66:
+              _context15.prev = 66;
+              _context15.t0 = _context15["catch"](47);
               _iterator.e(_context15.t0);
-            case 67:
-              _context15.prev = 67;
+            case 69:
+              _context15.prev = 69;
               _iterator.f();
-              return _context15.finish(67);
-            case 70:
+              return _context15.finish(69);
+            case 72:
               if (!result.discountList) {
-                _context15.next = 76;
+                _context15.next = 78;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 75;
+              _context15.next = 77;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 75:
+            case 77:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
-            case 76:
-              _context15.next = 78;
+            case 78:
+              _context15.next = 80;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 78:
+            case 80:
               summary = _context15.sent;
               this.store.order.persistTempOrder();
-              _context15.next = 82;
+              _context15.next = 84;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList,
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 82:
+            case 84:
               return _context15.abrupt("return", {
                 productList: tempOrder.products || [],
                 discountList: nextDiscountList
               });
-            case 83:
+            case 85:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[45, 64, 67, 70]]);
+        }, _callee15, this, [[47, 66, 69, 72]]);
       }));
       function loadDiscountConfig(_x10) {
         return _loadDiscountConfig.apply(this, arguments);
@@ -1697,7 +1699,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(cb) {
         var _discountModule$getOr2, _discountModule$getDi3;
-        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder3, _tempOrder$holder4, _orderStore$summary2, holders;
+        var tempOrder, orderStore, discountModule, rulesModule, originalDiscountList, currentDiscountList, nextDiscountList, result, _tempOrder$holder2, _orderStore$summary2, holders, orderTotalAmount;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1722,31 +1724,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
             case 12:
               if (!rulesModule) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
-              holders = (_tempOrder$holder3 = tempOrder.holder) !== null && _tempOrder$holder3 !== void 0 && _tempOrder$holder3.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
+              orderTotalAmount = Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0);
+              console.log('[BaseSales.bestDiscount.calcDiscount]');
               result = rulesModule.calcDiscount({
                 productList: tempOrder.products,
                 discountList: nextDiscountList,
                 holders: holders,
-                isFormSubject: !!((_tempOrder$holder4 = tempOrder.holder) !== null && _tempOrder$holder4 !== void 0 && _tempOrder$holder4.type) && tempOrder.holder.type === 'form',
-                orderTotalAmount: Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0)
+                isFormSubject: function isFormSubject(product) {
+                  return resolveIsFormSubject(tempOrder, product);
+                },
+                orderTotalAmount: orderTotalAmount
               }) || result;
               if (result.productList) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
-                _context16.next = 23;
+                _context16.next = 25;
                 break;
               }
               nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context16.next = 21;
+              _context16.next = 23;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 21:
+            case 23:
               tempOrder.discount_list = nextDiscountList.filter(function (discount) {
                 return discount.isSelected;
               });
@@ -1754,16 +1758,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: tempOrder.products,
                 discountList: nextDiscountList
               };
-            case 23:
-              _context16.next = 25;
+            case 25:
+              _context16.next = 27;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 25:
+            case 27:
               this.store.order.persistTempOrder();
               cb === null || cb === void 0 || cb(result);
               return _context16.abrupt("return", result);
-            case 28:
+            case 30:
             case "end":
               return _context16.stop();
           }
@@ -1834,7 +1838,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
-        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var _tempOrder$holder3, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1857,19 +1861,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               rulesModule = orderStore.rules;
-              holders = (_tempOrder$holder5 = tempOrder.holder) !== null && _tempOrder$holder5 !== void 0 && _tempOrder$holder5.form_record_id ? [{
-                form_record_id: tempOrder.holder.form_record_id
-              }] : [];
+              holders = ((_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_record) || [];
               nextDiscountList = updated;
               _context18.next = 14;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(updated);
             case 14:
               if (rulesModule) {
+                orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
+                console.log('[BaseSales.setDiscountSelected.calcDiscount]');
                 result = rulesModule.calcDiscount({
                   productList: tempOrder.products,
                   discountList: updated,
                   holders: holders,
-                  isFormSubject: !!((_tempOrder$holder6 = tempOrder.holder) !== null && _tempOrder$holder6 !== void 0 && _tempOrder$holder6.type) && tempOrder.holder.type === 'form'
+                  isFormSubject: function isFormSubject(product) {
+                    return resolveIsFormSubject(tempOrder, product);
+                  },
+                  orderTotalAmount: orderTotalAmount
                 }, {
                   discountId: params.discountId,
                   isSelected: params.isSelected
@@ -1895,6 +1902,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
                           d.isManualSelect = true;
+                          d.appliedProductDetails = [];
                         }
                       }
                     } catch (err) {
@@ -1910,28 +1918,45 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }).map(function (d) {
                 return d.id;
               }));
+              filterSelectedDiscountDetails = function filterSelectedDiscountDetails(discountList) {
+                return (discountList || []).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;
+                  return rid != null && selectedResourceIds.has(rid);
+                });
+              };
               _iterator3 = _createForOfIteratorHelper(tempOrder.products);
-              _context18.prev = 17;
+              _context18.prev = 18;
               _iterator3.s();
-            case 19:
+            case 20:
               if ((_step3 = _iterator3.n()).done) {
-                _context18.next = 35;
+                _context18.next = 37;
                 break;
               }
               product = _step3.value;
               productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.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 || isBaseSalesManualProductDiscountProduct(product))) {
-                _context18.next = 25;
+                _context18.next = 26;
                 break;
               }
-              return _context18.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;
-                return rid != null && selectedResourceIds.has(rid);
-              });
+              return _context18.abrupt("continue", 35);
+            case 26:
+              product.discount_list = filterSelectedDiscountDetails(product.discount_list);
+              if (Array.isArray(product.product_bundle)) {
+                product.product_bundle = product.product_bundle.map(function (bundle) {
+                  var _ref18, _bundle$original_pric;
+                  var nextBundleDiscountList = filterSelectedDiscountDetails(bundle === null || bundle === void 0 ? void 0 : bundle.discount_list);
+                  var shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
+                  var restoredBundlePrice = (_ref18 = (_bundle$original_pric = bundle === null || bundle === void 0 ? void 0 : bundle.original_price) !== null && _bundle$original_pric !== void 0 ? _bundle$original_pric : bundle === null || bundle === void 0 ? void 0 : bundle.product_price) !== null && _ref18 !== void 0 ? _ref18 : bundle === null || bundle === void 0 ? void 0 : bundle.price;
+                  return _objectSpread(_objectSpread(_objectSpread({}, bundle), shouldRestoreBundlePrice ? {
+                    price: restoredBundlePrice,
+                    bundle_selling_price: restoredBundlePrice
+                  } : {}), {}, {
+                    discount_list: nextBundleDiscountList
+                  });
+                });
+              }
 
               // 券作用于 source（不含 option、不含 bundle）；算出新 source 折后价后补回 options
               // 写入含 option 的 main_product_selling_price，再合成 composite 回写 selling_price。
@@ -1950,33 +1975,33 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 33:
-              _context18.next = 19;
-              break;
             case 35:
-              _context18.next = 40;
+              _context18.next = 20;
               break;
             case 37:
-              _context18.prev = 37;
-              _context18.t0 = _context18["catch"](17);
+              _context18.next = 42;
+              break;
+            case 39:
+              _context18.prev = 39;
+              _context18.t0 = _context18["catch"](18);
               _iterator3.e(_context18.t0);
-            case 40:
-              _context18.prev = 40;
+            case 42:
+              _context18.prev = 42;
               _iterator3.f();
-              return _context18.finish(40);
-            case 43:
+              return _context18.finish(42);
+            case 45:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context18.next = 46;
+              _context18.next = 48;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 46:
+            case 48:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context18.next = 49;
+              _context18.next = 51;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 49:
+            case 51:
               this.store.order.persistTempOrder();
               this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products,
@@ -1984,17 +2009,17 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 selectedDiscountList: tempOrder.discount_list,
                 tempOrder: tempOrder
               });
-              _context18.next = 56;
+              _context18.next = 58;
               break;
-            case 53:
-              _context18.prev = 53;
+            case 55:
+              _context18.prev = 55;
               _context18.t1 = _context18["catch"](0);
               throw _context18.t1;
-            case 56:
+            case 58:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[0, 53], [17, 37, 40, 43]]);
+        }, _callee18, this, [[0, 55], [18, 39, 42, 45]]);
       }));
       function setDiscountSelected(_x14) {
         return _setDiscountSelected.apply(this, arguments);
@@ -2105,7 +2130,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 2:
               // this.store.order.persistTempOrder();
               inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
-              submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
                 businessCode: ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) || ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code),
@@ -2118,6 +2143,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentStatus: inferredPaymentStatus
               } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
                 smallTicketDataFlag: params.smallTicketDataFlag
+              } : {}), (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== undefined ? {
+                confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
                 enhancePayload: params.enhancePayload
               } : {});
@@ -2149,7 +2176,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('BaseSales 解决方案需要 order 模块支持');
             case 2:
               inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
-              submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.platform,
                 businessCode: ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.businessCode) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.business_code),
@@ -2161,6 +2188,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentStatus: inferredPaymentStatus
               } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
                 smallTicketDataFlag: params.smallTicketDataFlag
+              } : {}), (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== undefined ? {
+                confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
                 enhancePayload: params.enhancePayload
               } : {});
@@ -2260,7 +2289,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
-        var _ref18, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
+        var _ref19, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
         var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
@@ -2271,7 +2300,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref18 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref18 !== void 0 ? _ref18 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
+              businessCode = (_ref19 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) !== null && _ref19 !== void 0 ? _ref19 : (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code;
               channel = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel();
               syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
@@ -2375,7 +2404,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams20,
         _paymentRecord$paymen,
         _paymentRecord$create,
-        _ref19,
+        _ref20,
         _paymentRecord$origin,
         _this8 = this;
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -2399,7 +2428,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var paymentTime = (_paymentRecord$paymen = paymentRecord.payment_time) !== null && _paymentRecord$paymen !== void 0 ? _paymentRecord$paymen : paymentTimestamp;
       var createdAt = (_paymentRecord$create = paymentRecord.created_at) !== null && _paymentRecord$create !== void 0 ? _paymentRecord$create : paymentTimestamp;
       var serviceCharge = paymentRecord.service_charge && _typeof(paymentRecord.service_charge) === 'object' ? paymentRecord.service_charge : null;
-      var calculatedServiceFee = serviceCharge ? new Decimal((_ref19 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref19 !== void 0 ? _ref19 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
+      var calculatedServiceFee = serviceCharge ? new Decimal((_ref20 = (_paymentRecord$origin = paymentRecord.origin_amount) !== null && _paymentRecord$origin !== void 0 ? _paymentRecord$origin : paymentRecord.amount) !== null && _ref20 !== void 0 ? _ref20 : 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : undefined;
       var payments = this.store.order.addOrderPayment(_objectSpread(_objectSpread(_objectSpread({}, paymentRecord), calculatedServiceFee !== undefined ? {
         service_fee: calculatedServiceFee
       } : {}), {}, {
@@ -2445,9 +2474,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
   }, {
     key: "updateVoucherOrderPayments",
-    value: function updateVoucherOrderPayments(payments) {
+    value: function updateVoucherOrderPayments(payments, options) {
+      if (!this.store.order) throw new Error('order 模块未初始化');
+      return this.store.order.updateVoucherOrderPayments(payments, options);
+    }
+  }, {
+    key: "confirmPendingVoucherPayments",
+    value: function confirmPendingVoucherPayments() {
+      if (!this.store.order) throw new Error('order 模块未初始化');
+      return this.store.order.confirmPendingVoucherPayments();
+    }
+  }, {
+    key: "discardPendingVoucherPayments",
+    value: function discardPendingVoucherPayments() {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      return this.store.order.updateVoucherOrderPayments(payments);
+      return this.store.order.discardPendingVoucherPayments();
     }
   }, {
     key: "getWalletProductList",
@@ -2511,7 +2552,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-        var _params$order_wait_pa, _ref20, _tempOrder$is_price_i;
+        var _params$order_wait_pa, _ref21, _tempOrder$is_price_i;
         var snapshot, tempOrder, amount, walletBusinessData, result;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
@@ -2554,7 +2595,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 products: this.getWalletProductList(),
                 order_wait_pay_amount: (_params$order_wait_pa = params === null || params === void 0 ? void 0 : params.order_wait_pay_amount) !== null && _params$order_wait_pa !== void 0 ? _params$order_wait_pa : Number(amount.amountGap || 0),
-                is_price_include_tax: (_ref20 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref20 !== void 0 ? _ref20 : 1
+                is_price_include_tax: (_ref21 = (_tempOrder$is_price_i = tempOrder.is_price_include_tax) !== null && _tempOrder$is_price_i !== void 0 ? _tempOrder$is_price_i : this.otherParams.is_price_include_tax) !== null && _ref21 !== void 0 ? _ref21 : 1
               }, snapshot.identity.orderId ? {
                 payment_order_id: String(snapshot.identity.orderId)
               } : {});
@@ -2685,7 +2726,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "sendCustomerPayLink",
     value: (function () {
       var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var orderIds, _ref21, _ref22, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
+        var orderIds, _ref22, _ref23, _submitResult$data$or, _submitResult$data, _submitResult$data2, submitResult, orderId;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
@@ -2706,7 +2747,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 6:
               submitResult = _context27.sent;
-              orderId = (_ref21 = (_ref22 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref22 !== void 0 ? _ref22 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref21 !== void 0 ? _ref21 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
+              orderId = (_ref22 = (_ref23 = (_submitResult$data$or = submitResult === null || submitResult === void 0 || (_submitResult$data = submitResult.data) === null || _submitResult$data === void 0 ? void 0 : _submitResult$data.order_id) !== null && _submitResult$data$or !== void 0 ? _submitResult$data$or : submitResult === null || submitResult === void 0 ? void 0 : submitResult.order_id) !== null && _ref23 !== void 0 ? _ref23 : submitResult === null || submitResult === void 0 || (_submitResult$data2 = submitResult.data) === null || _submitResult$data2 === void 0 ? void 0 : _submitResult$data2.id) !== null && _ref22 !== void 0 ? _ref22 : submitResult === null || submitResult === void 0 ? void 0 : submitResult.id;
               if (orderId) {
                 _context27.next = 10;
                 break;
@@ -2878,12 +2919,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               _context30.next = 9;
               return Promise.all(Array.from(groups.entries()).map( /*#__PURE__*/function () {
-                var _ref24 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(_ref23) {
-                  var _ref25, groupKey, group, productsById;
+                var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(_ref24) {
+                  var _ref26, groupKey, group, productsById;
                   return _regeneratorRuntime().wrap(function _callee29$(_context29) {
                     while (1) switch (_context29.prev = _context29.next) {
                       case 0:
-                        _ref25 = _slicedToArray(_ref23, 2), groupKey = _ref25[0], group = _ref25[1];
+                        _ref26 = _slicedToArray(_ref24, 2), groupKey = _ref26[0], group = _ref26[1];
                         _context29.next = 3;
                         return _this10.loadProductsForPriceQuery({
                           ids: Array.from(group.ids),
@@ -2901,7 +2942,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   }, _callee29);
                 }));
                 return function (_x25) {
-                  return _ref24.apply(this, arguments);
+                  return _ref25.apply(this, arguments);
                 };
               }()));
             case 9:
@@ -3330,14 +3371,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
         var _this$otherParams22;
-        var _ref26,
-          _ref26$cover,
+        var _ref27,
+          _ref27$cover,
           cover,
           _args40 = arguments;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
-              _ref26 = _args40.length > 1 && _args40[1] !== undefined ? _args40[1] : {}, _ref26$cover = _ref26.cover, cover = _ref26$cover === void 0 ? false : _ref26$cover;
+              _ref27 = _args40.length > 1 && _args40[1] !== undefined ? _args40[1] : {}, _ref27$cover = _ref27.cover, cover = _ref27$cover === void 0 ? false : _ref27$cover;
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -105,7 +105,9 @@ export function transformBaseProductToOrderProduct(params) {
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
   var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
-  var lineCompositeTotal = toPriceString((_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total, sourceProductPrice);
+  var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
+  var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
+  var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
   var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
@@ -148,7 +150,7 @@ export function transformBaseProductToOrderProduct(params) {
     mainPrice: 0,
     bundle: productBundle
   });
-  var derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  var derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   var mainProductSellingPrice = toPriceString(Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice));
   var metadata = _objectSpread(_objectSpread({
     unique: payload.unique,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;