@pisell/pisellos 0.0.500 → 0.0.501

package/dist/modules/Quotation/index.js

@@ -78,18 +78,21 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
-              _context2.next = 4;
+              if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
+                query.channel = 'online-store';
+              }
+              _context2.next = 5;
               return this.request.get('/quotation/available', query, {
                 useCache: false
               });
-            case 4:
+            case 5:
               res = _context2.sent;
               list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 8:
+            case 9:
             case "end":
               return _context2.stop();
           }

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

@@ -2,9 +2,10 @@ export interface SalesSummaryProduct {
     product_id: number | null;
     product_variant_id: number;
     num: number;
+    /** 券后单品单价（订单域成交单价），由 OrderModule 维护。 */
     selling_price: string;
+    /** 券前单品单价（店铺售价）。 */
     original_price: string;
-    payment_price: string;
     tax_fee: string;
     is_charge_tax?: number;
     product_option_item?: any[];

package/dist/modules/SalesSummary/utils.js

@@ -68,7 +68,7 @@ function getBundleUnitPrice(product) {
 // 单商品总价口径：主商品单价 + option + bundle（随后再乘商品数量）
 function getUnitPaymentTotal(product) {
   var variantPrice = getVariantPrice(product);
-  var basePrice = variantPrice || toDecimal(product.selling_price || product.payment_price);
+  var basePrice = variantPrice || toDecimal(product.selling_price);
   return basePrice.plus(getOptionUnitPrice(product)).plus(getBundleUnitPrice(product));
 }
 function getUnitOriginalTotal(product) {
@@ -254,9 +254,9 @@ function calculateSingleItemTax(params) {
  * 与 Summary/utils.ts 的 getMainProductTotal 逻辑对齐，适配 SalesSummaryProduct 结构。
  */
 function getMainProductPaymentTotal(product) {
-  var _ref2, _product$metadata$mai, _product$metadata4, _product$_origin3, _product$_origin4;
+  var _product$metadata$mai, _product$metadata4, _product$_origin3, _product$_origin4;
   var variantPrice = getVariantPrice(product);
-  var total = variantPrice || toDecimal((_ref2 = (_product$metadata$mai = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : product.selling_price) !== null && _ref2 !== void 0 ? _ref2 : product.payment_price);
+  var total = variantPrice || toDecimal((_product$metadata$mai = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) !== null && _product$metadata$mai !== void 0 ? _product$metadata$mai : product.selling_price);
   var mainDiscountList = ((_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 || (_product$_origin3 = _product$_origin3.product) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.discount_list) || ((_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.discount_list) || [];
   var mainDiscountAmount = getDiscountListAmount(mainDiscountList.filter(function (d) {
     var _d$metadata;
@@ -271,8 +271,8 @@ function getMainProductPaymentTotal(product) {
     for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
       var bundleItem = _step5.value;
       if (isBundleMarkupOrDiscount(bundleItem)) {
-        var _ref3, _bundleItem$bundle_se;
-        total = total.plus(toDecimal((_ref3 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0));
+        var _ref2, _bundleItem$bundle_se;
+        total = total.plus(toDecimal((_ref2 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref2 !== void 0 ? _ref2 : 0));
       }
     }
   } catch (err) {
@@ -340,24 +340,24 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
         _step7;
       try {
         for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _bundleItem$num, _ref4, _bundleItem$bundle_se2, _ref5, _ref6, _bundleItem$original_, _ref7, _bundleItem$is_charge, _ref8, _bundleItem$is_charge2;
+          var _bundleItem$num, _ref3, _bundleItem$bundle_se2, _ref4, _ref5, _bundleItem$original_, _ref6, _bundleItem$is_charge, _ref7, _bundleItem$is_charge2;
           var bundleItem = _step7.value;
           if (!isBundleOriginalPrice(bundleItem)) continue;
           var bundleQuantity = new Decimal(getSafeNum((_bundleItem$num = bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem.quantity));
-          var bundlePrice = toDecimal((_ref4 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
-          var bundleOriginalPrice = toDecimal((_ref5 = (_ref6 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var bundlePrice = toDecimal((_ref3 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref3 !== void 0 ? _ref3 : 0);
+          var bundleOriginalPrice = toDecimal((_ref4 = (_ref5 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : bundleItem.price) !== null && _ref4 !== void 0 ? _ref4 : 0);
           var bundleTaxPrecise = calculateSingleItemTax({
             price: bundlePrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref7 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
+            isChargeTax: (_ref6 = (_bundleItem$is_charge = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge !== void 0 ? _bundleItem$is_charge : product.is_charge_tax) !== null && _ref6 !== void 0 ? _ref6 : 0
           });
           var bundleTaxRounded = bundleTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           var bundleOrigTaxPrecise = calculateSingleItemTax({
             price: bundleOriginalPrice,
             taxRate: rate,
             isPriceIncludeTax: isPriceIncludeTax,
-            isChargeTax: (_ref8 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref8 !== void 0 ? _ref8 : 0
+            isChargeTax: (_ref7 = (_bundleItem$is_charge2 = bundleItem.is_charge_tax) !== null && _bundleItem$is_charge2 !== void 0 ? _bundleItem$is_charge2 : product.is_charge_tax) !== null && _ref7 !== void 0 ? _ref7 : 0
           });
           var bundleOrigTaxRounded = bundleOrigTaxPrecise.toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
           bundleItem.tax_fee = bundleTaxRounded.toNumber();

package/dist/modules/Schedule/utils.d.ts

@@ -46,7 +46,7 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 };
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
-export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => {};
+export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => ScheduleAllMap;
 /**
  * @title: 格式化日程数据
  * @description:

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 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -27,6 +27,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleConfigsPromise;
     private itemRulePrefillApplied;
     private itemRuleRuntimeConfig;
+    /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
+    private enabledReservationRuleProducts;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -87,4 +89,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }>;
     getProductList(): Promise<any>;
     getOtherParams(): Record<string, any>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
+    setEntryPaxNumber(number: number): Promise<void>;
+    getEntryPaxNumber(): number | null;
 }