@pisell/pisellos 0.0.495 → 0.0.497

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

@@ -112,14 +112,14 @@ export interface SubmitScanOrderParams {
         products: SubmitScanOrderProduct[];
         bookings: SubmitScanOrderBooking[];
         payments: any[];
-        surcharges: any[];
+        surcharges?: any[];
         discount_list: any[];
         relation_forms: any[];
         form_record_ids?: SubmitScanOrderFormRecord[];
         contacts: any[];
         contacts_info: any[];
         holder: Record<string, any> | null;
-        summary: SubmitScanOrderSummary;
+        summary?: SubmitScanOrderSummary;
         metadata: Record<string, any>;
     };
 }

package/dist/modules/Order/utils.js

@@ -1,5 +1,5 @@
 var _excluded = ["_origin", "identity_key"],
-  _excluded2 = ["created_at"];
+  _excluded2 = ["created_at", "summary", "surcharges"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -233,8 +233,10 @@ export function buildSubmitPayload(params) {
     form_record_ids: [relationId]
   }] : undefined;
   var _createdAt = tempOrder.created_at,
-    tempOrderWithoutCreatedAt = _objectWithoutProperties(tempOrder, _excluded2);
-  return _objectSpread(_objectSpread({}, tempOrderWithoutCreatedAt), {}, {
+    _summary = tempOrder.summary,
+    _surcharges = tempOrder.surcharges,
+    tempOrderRest = _objectWithoutProperties(tempOrder, _excluded2);
+  return _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(tempOrder.platform),
     request_unique_idempotency_token: cacheId,
     type: tempOrder.type || 'table-order',
@@ -254,7 +256,6 @@ export function buildSubmitPayload(params) {
     schedule_date: scheduleDate,
     bookings: bookings,
     payments: tempOrder.payments || [],
-    surcharges: tempOrder.surcharges || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     form_record_ids: formRecordIds,

package/dist/modules/SalesSummary/utils.js

@@ -304,8 +304,10 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
 
       // --- 主商品折后税费 ---
       var mainTotal = getMainProductPaymentTotal(product);
+      var surchargeFee = toDecimal(product.surcharge_fee);
+      var mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
       var mainTaxPrecise = calculateSingleItemTax({
-        price: mainTotal,
+        price: mainTaxableBase,
         taxRate: rate,
         isPriceIncludeTax: isPriceIncludeTax,
         isChargeTax: (_product$is_charge_ta2 = product.is_charge_tax) !== null && _product$is_charge_ta2 !== void 0 ? _product$is_charge_ta2 : 0
@@ -320,8 +322,9 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
 
       // --- 主商品原价税费 ---
       var originalTotal = getUnitOriginalTotal(product);
+      var originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
       var originalTaxPrecise = calculateSingleItemTax({
-        price: originalTotal,
+        price: originalTaxableBase,
         taxRate: rate,
         isPriceIncludeTax: isPriceIncludeTax,
         isChargeTax: (_product$is_charge_ta3 = product.is_charge_tax) !== null && _product$is_charge_ta3 !== void 0 ? _product$is_charge_ta3 : 0
@@ -451,16 +454,6 @@ export function calculateSalesSummary(params) {
   var productAmount = products.reduce(function (sum, item) {
     return sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num)));
   }, new Decimal(0));
-  var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
-  var productTaxFee;
-  if (hasTaxRate) {
-    var taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
-    productTaxFee = taxResult.tax;
-  } else {
-    productTaxFee = products.reduce(function (sum, item) {
-      return sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num)));
-    }, new Decimal(0));
-  }
   var surchargeServiceItems = buildSurchargeServiceItems(products);
   var surcharge = getSurcharge({
     service: surchargeServiceItems,
@@ -479,6 +472,20 @@ export function calculateSalesSummary(params) {
   }, surcharge, {
     isEdit: false
   }) || 0);
+  for (var i = 0; i < products.length; i++) {
+    var _surchargeServiceItem;
+    products[i].surcharge_fee = ((_surchargeServiceItem = surchargeServiceItems[i]) === null || _surchargeServiceItem === void 0 ? void 0 : _surchargeServiceItem.surcharge_fee) || 0;
+  }
+  var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
+  var productTaxFee;
+  if (hasTaxRate) {
+    var taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
+    productTaxFee = taxResult.tax;
+  } else {
+    productTaxFee = products.reduce(function (sum, item) {
+      return sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num)));
+    }, new Decimal(0));
+  }
   var expectAmount = productAmount.plus(surchargeAmount);
   var totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
   var deposit = calculateProductsDeposit(products);

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 | 1 | 4 | 2 | 3 | 6 | 5;
     }[]>;
     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/types.d.ts

@@ -122,7 +122,7 @@ export interface ScanOrderTempOrder {
     summary: ScanOrderSummary;
     metadata: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at'> {
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
     platform: 'H5' | 'PC';
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{

package/dist/solution/VenueBooking/index.js

@@ -47,6 +47,7 @@ import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentity
 import { createUuidV4 } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
+import Decimal from 'decimal.js';
 export * from "./types";
 var OPEN_DATA_SECTION_CODES = ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow', 'checkout'];
 function cloneCustomDepositData(customDepositData) {
@@ -1672,7 +1673,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: (function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
-        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator7, _step7, d, afterApplyTarget, finalSummary, finalProduct, finalTarget;
+        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator7, _step7, d, selectedResourceIds, _iterator8, _step8, _product$discount_lis, product, before, totalDiscountAmount, newPaymentPrice, paymentStr, afterApplyTarget, finalSummary, finalProduct, finalTarget;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1748,21 +1749,73 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }
               }
+              selectedResourceIds = new Set(nextDiscountList.filter(function (d) {
+                return d.isSelected;
+              }).map(function (d) {
+                return d.id;
+              }));
+              _iterator8 = _createForOfIteratorHelper(tempOrder.products);
+              _context20.prev = 19;
+              _iterator8.s();
+            case 21:
+              if ((_step8 = _iterator8.n()).done) {
+                _context20.next = 30;
+                break;
+              }
+              product = _step8.value;
+              if ((_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length) {
+                _context20.next = 25;
+                break;
+              }
+              return _context20.abrupt("continue", 28);
+            case 25:
+              before = product.discount_list.length;
+              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);
+              });
+              if (product.discount_list.length < before) {
+                totalDiscountAmount = product.discount_list.reduce(function (sum, pd) {
+                  return sum + (pd.amount || 0);
+                }, 0);
+                newPaymentPrice = new Decimal(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
+                paymentStr = toPriceString(newPaymentPrice);
+                product.payment_price = paymentStr;
+                if (product.metadata) {
+                  product.metadata.main_product_selling_price = paymentStr;
+                }
+              }
+            case 28:
+              _context20.next = 21;
+              break;
+            case 30:
+              _context20.next = 35;
+              break;
+            case 32:
+              _context20.prev = 32;
+              _context20.t0 = _context20["catch"](19);
+              _iterator8.e(_context20.t0);
+            case 35:
+              _context20.prev = 35;
+              _iterator8.f();
+              return _context20.finish(35);
+            case 38:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context20.next = 20;
+              _context20.next = 41;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 20:
+            case 41:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
               afterApplyTarget = this.store.order.getDiscountList().find(function (d) {
                 return d.id === params.discountId;
               }) || null;
-              _context20.next = 24;
+              _context20.next = 45;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 24:
+            case 45:
               this.store.order.persistTempOrder();
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
@@ -1771,16 +1824,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return d.id === params.discountId;
               }) || null;
               return _context20.abrupt("return", this.store.order.getDiscountList());
-            case 32:
-              _context20.prev = 32;
-              _context20.t0 = _context20["catch"](1);
-              this.logMethodError('setDiscountSelected', _context20.t0);
-              throw _context20.t0;
-            case 36:
+            case 53:
+              _context20.prev = 53;
+              _context20.t1 = _context20["catch"](1);
+              this.logMethodError('setDiscountSelected', _context20.t1);
+              throw _context20.t1;
+            case 57:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[1, 32]]);
+        }, _callee20, this, [[1, 53], [19, 32, 35, 38]]);
       }));
       function setDiscountSelected(_x14) {
         return _setDiscountSelected.apply(this, arguments);
@@ -2254,17 +2307,17 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 if (visited.has(value)) return;
                 visited.add(value);
                 if (Array.isArray(value)) {
-                  var _iterator8 = _createForOfIteratorHelper(value),
-                    _step8;
+                  var _iterator9 = _createForOfIteratorHelper(value),
+                    _step9;
                   try {
-                    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                      var item = _step8.value;
+                    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                      var item = _step9.value;
                       collectFromValue(item);
                     }
                   } catch (err) {
-                    _iterator8.e(err);
+                    _iterator9.e(err);
                   } finally {
-                    _iterator8.f();
+                    _iterator9.f();
                   }
                   return;
                 }
@@ -2419,7 +2472,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator9, _step9, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, _ref5, _sourceItem$original_, _ref6, _sourceItem$payment_p, sellingPrice, originalPrice, paymentPrice, targetProduct, existedQuantity, delta, nextProduct;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator10, _step10, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, _ref5, _sourceItem$original_, _ref6, _sourceItem$payment_p, sellingPrice, originalPrice, paymentPrice, targetProduct, existedQuantity, delta, nextProduct;
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
@@ -2464,15 +2517,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               productSourceMap = _context35.sent;
               tempOrder = this.ensureTempOrder();
               hasChanges = false;
-              _iterator9 = _createForOfIteratorHelper(prefillItems);
+              _iterator10 = _createForOfIteratorHelper(prefillItems);
               _context35.prev = 20;
-              _iterator9.s();
+              _iterator10.s();
             case 22:
-              if ((_step9 = _iterator9.n()).done) {
+              if ((_step10 = _iterator10.n()).done) {
                 _context35.next = 47;
                 break;
               }
-              prefillItem = _step9.value;
+              prefillItem = _step10.value;
               productId = Number(prefillItem.product_id);
               productVariantId = Number((_prefillItem$product_ = prefillItem.product_variant_id) !== null && _prefillItem$product_ !== void 0 ? _prefillItem$product_ : 0);
               targetQuantity = toNonNegativeInt(prefillItem.quantity);
@@ -2544,10 +2597,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             case 49:
               _context35.prev = 49;
               _context35.t0 = _context35["catch"](20);
-              _iterator9.e(_context35.t0);
+              _iterator10.e(_context35.t0);
             case 52:
               _context35.prev = 52;
-              _iterator9.f();
+              _iterator10.f();
               return _context35.finish(52);
             case 55:
               if (!hasChanges) {

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -66,8 +66,8 @@ export function buildPriceBreakdown(params) {
         productId: productId,
         datetime: slot.startTime
       }) : 0;
-      var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
-      var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
+      var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
+      var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
       if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
@@ -150,7 +150,6 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   var endTime = meta.end_time;
   if (!startTime || !endTime) return [];
   var breakdown = meta.price_breakdown;
-  var datePrefix = dayjs(startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD');
   var result = [];
   var cursor = dayjs(startTime, 'YYYY-MM-DD HH:mm');
   var end = dayjs(endTime, 'YYYY-MM-DD HH:mm');
@@ -161,8 +160,8 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var entry = _step2.value;
-        var entryCursor = dayjs("".concat(datePrefix, " ").concat(entry.start_time), 'YYYY-MM-DD HH:mm');
-        var entryEnd = dayjs("".concat(datePrefix, " ").concat(entry.end_time), 'YYYY-MM-DD HH:mm');
+        var entryCursor = dayjs(entry.start_time, 'YYYY-MM-DD HH:mm');
+        var entryEnd = dayjs(entry.end_time, 'YYYY-MM-DD HH:mm');
         while (entryCursor.isBefore(entryEnd)) {
           priceMap.set(entryCursor.format('HH:mm'), entry.unit_price);
           entryCursor = entryCursor.add(slotDurationMinutes, 'minute');

package/lib/modules/Order/types.d.ts

@@ -112,14 +112,14 @@ export interface SubmitScanOrderParams {
         products: SubmitScanOrderProduct[];
         bookings: SubmitScanOrderBooking[];
         payments: any[];
-        surcharges: any[];
+        surcharges?: any[];
         discount_list: any[];
         relation_forms: any[];
         form_record_ids?: SubmitScanOrderFormRecord[];
         contacts: any[];
         contacts_info: any[];
         holder: Record<string, any> | null;
-        summary: SubmitScanOrderSummary;
+        summary?: SubmitScanOrderSummary;
         metadata: Record<string, any>;
     };
 }

package/lib/modules/Order/utils.js

@@ -235,9 +235,9 @@ function buildSubmitPayload(params) {
     form_id: tableFormId,
     form_record_ids: [relationId]
   }] : void 0;
-  const { created_at: _createdAt, ...tempOrderWithoutCreatedAt } = tempOrder;
+  const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
   return {
-    ...tempOrderWithoutCreatedAt,
+    ...tempOrderRest,
     platform: normalizeSubmitPlatform(tempOrder.platform),
     request_unique_idempotency_token: cacheId,
     type: tempOrder.type || "table-order",
@@ -257,7 +257,6 @@ function buildSubmitPayload(params) {
     schedule_date: scheduleDate,
     bookings,
     payments: tempOrder.payments || [],
-    surcharges: tempOrder.surcharges || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     form_record_ids: formRecordIds,

package/lib/modules/SalesSummary/utils.js

@@ -259,8 +259,10 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
   for (const product of products) {
     const quantity = new import_decimal.default(getSafeNum(product.num));
     const mainTotal = getMainProductPaymentTotal(product);
+    const surchargeFee = toDecimal(product.surcharge_fee);
+    const mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
     const mainTaxPrecise = calculateSingleItemTax({
-      price: mainTotal,
+      price: mainTaxableBase,
       taxRate: rate,
       isPriceIncludeTax,
       isChargeTax: product.is_charge_tax ?? 0
@@ -270,8 +272,9 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       lastTaxableItem = { type: "main", item: product };
     }
     const originalTotal = getUnitOriginalTotal(product);
+    const originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
     const originalTaxPrecise = calculateSingleItemTax({
-      price: originalTotal,
+      price: originalTaxableBase,
       taxRate: rate,
       isPriceIncludeTax,
       isChargeTax: product.is_charge_tax ?? 0
@@ -358,6 +361,7 @@ function createEmptySalesSummary() {
   };
 }
 function calculateSalesSummary(params) {
+  var _a;
   const {
     products,
     isPriceIncludeTax,
@@ -380,17 +384,6 @@ function calculateSalesSummary(params) {
     (sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))),
     new import_decimal.default(0)
   );
-  const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
-  let productTaxFee;
-  if (hasTaxRate) {
-    const taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
-    productTaxFee = taxResult.tax;
-  } else {
-    productTaxFee = products.reduce(
-      (sum, item) => sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num))),
-      new import_decimal.default(0)
-    );
-  }
   const surchargeServiceItems = buildSurchargeServiceItems(products);
   const surcharge = (0, import_utils.getSurcharge)(
     {
@@ -413,6 +406,20 @@ function calculateSalesSummary(params) {
       { isEdit: false }
     ) || 0
   );
+  for (let i = 0; i < products.length; i++) {
+    products[i].surcharge_fee = ((_a = surchargeServiceItems[i]) == null ? void 0 : _a.surcharge_fee) || 0;
+  }
+  const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
+  let productTaxFee;
+  if (hasTaxRate) {
+    const taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
+    productTaxFee = taxResult.tax;
+  } else {
+    productTaxFee = products.reduce(
+      (sum, item) => sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num))),
+      new import_decimal.default(0)
+    );
+  }
   const expectAmount = productAmount.plus(surchargeAmount);
   const totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
   const deposit = calculateProductsDeposit(products);

package/lib/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 | 1 | 4 | 2 | 3 | 6 | 5;
     }[]>;
     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/lib/solution/ScanOrder/types.d.ts

@@ -122,7 +122,7 @@ export interface ScanOrderTempOrder {
     summary: ScanOrderSummary;
     metadata: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at'> {
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
     platform: 'H5' | 'PC';
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{

package/lib/solution/VenueBooking/index.js

@@ -52,6 +52,7 @@ var import_slotMerge = require("./utils/slotMerge");
 var import_utils2 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
+var import_decimal = __toESM(require("decimal.js"));
 __reExport(VenueBooking_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = [
   "basic",
@@ -1015,7 +1016,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   /** 勾选/取消勾选某张折扣券，重新计算折扣并持久化 */
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     this.logMethodStart("setDiscountSelected", params);
     try {
       if (!this.store.order)
@@ -1067,14 +1068,39 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
+      const selectedResourceIds = new Set(
+        nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
+      );
+      for (const product of tempOrder.products) {
+        if (!((_c = product.discount_list) == null ? void 0 : _c.length))
+          continue;
+        const before = product.discount_list.length;
+        product.discount_list = product.discount_list.filter((pd) => {
+          var _a2;
+          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+          return rid != null && selectedResourceIds.has(rid);
+        });
+        if (product.discount_list.length < before) {
+          const totalDiscountAmount = product.discount_list.reduce(
+            (sum, pd) => sum + (pd.amount || 0),
+            0
+          );
+          const newPaymentPrice = new import_decimal.default(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
+          const paymentStr = (0, import_utils.toPriceString)(newPaymentPrice);
+          product.payment_price = paymentStr;
+          if (product.metadata) {
+            product.metadata.main_product_selling_price = paymentStr;
+          }
+        }
+      }
       import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
       await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
       tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
       const afterApplyTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
-      const finalSummary = ((_c = this.store.order.getTempOrder()) == null ? void 0 : _c.summary) || null;
-      const finalProduct = ((_e = (_d = this.store.order.getTempOrder()) == null ? void 0 : _d.products) == null ? void 0 : _e[0]) || null;
+      const finalSummary = ((_d = this.store.order.getTempOrder()) == null ? void 0 : _d.summary) || null;
+      const finalProduct = ((_f = (_e = this.store.order.getTempOrder()) == null ? void 0 : _e.products) == null ? void 0 : _f[0]) || null;
       this.logMethodSuccess("setDiscountSelected", params);
       const finalTarget = this.store.order.getDiscountList().find((d) => d.id === params.discountId) || null;
       return this.store.order.getDiscountList();

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -88,8 +88,8 @@ function buildPriceBreakdown(params) {
   for (const slot of group.slots) {
     const unitPrice = Number(slot.price || "0");
     const shelfId = quotation ? quotation.getQuotationShelfId({ productId, datetime: slot.startTime }) : 0;
-    const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("HH:mm");
-    const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("HH:mm");
+    const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
+    const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
     const last = entries[entries.length - 1];
     if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
       last.end_time = endHm;
@@ -157,15 +157,14 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   if (!startTime || !endTime)
     return [];
   const breakdown = meta.price_breakdown;
-  const datePrefix = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD");
   const result = [];
   let cursor = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm");
   const end = (0, import_dayjs.default)(endTime, "YYYY-MM-DD HH:mm");
   if (breakdown == null ? void 0 : breakdown.length) {
     const priceMap = /* @__PURE__ */ new Map();
     for (const entry of breakdown) {
-      let entryCursor = (0, import_dayjs.default)(`${datePrefix} ${entry.start_time}`, "YYYY-MM-DD HH:mm");
-      const entryEnd = (0, import_dayjs.default)(`${datePrefix} ${entry.end_time}`, "YYYY-MM-DD HH:mm");
+      let entryCursor = (0, import_dayjs.default)(entry.start_time, "YYYY-MM-DD HH:mm");
+      const entryEnd = (0, import_dayjs.default)(entry.end_time, "YYYY-MM-DD HH:mm");
       while (entryCursor.isBefore(entryEnd)) {
         priceMap.set(entryCursor.format("HH:mm"), entry.unit_price);
         entryCursor = entryCursor.add(slotDurationMinutes, "minute");

package/package.json

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