@pisell/pisellos 0.0.451 → 0.0.453

package/dist/modules/Discount/index.d.ts

@@ -25,6 +25,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/dist/modules/Discount/index.js

@@ -208,6 +208,35 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
+  }, {
+    key: "batchSearchByProductIds",
+    value: function () {
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
+        var result;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.request.get("/machinecode/batch-search", {
+                ids: productIds,
+                translate_flag: 1,
+                tags: ['good_pass', 'product_discount_card'],
+                relation_product: 1
+              });
+            case 2:
+              result = _context6.sent;
+              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function batchSearchByProductIds(_x8) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -309,21 +338,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context6.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -333,18 +362,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -137,6 +137,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Rules/index.js

@@ -295,13 +295,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         orderTotalAmount = _ref2.orderTotalAmount,
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = productList.find(function (n) {
-        return n.booking_id;
-      }) && productList.find(function (n) {
-        return !n.booking_id;
-      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -352,7 +345,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num
+            num: product.num,
+            booking_id: product.booking_id
           });
 
           // 2. 展开 bundle 子商品
@@ -376,7 +370,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: product.booking_id,
+                booking_id: bundleItem.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -514,6 +508,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 扁平化商品列表（包含主商品和bundle子商品）
       var flattenedList = flattenProductsWithBundle(productList);
 
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = flattenedList.find(function (n) {
+        return n.booking_id;
+      }) && flattenedList.find(function (n) {
+        return !n.booking_id;
+      });
+
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
         var _ref3, _a$original_price, _ref4, _b$original_price;
@@ -896,7 +898,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num
+                num: num,
+                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
               }
             };
             applicableProducts.push(productData);
@@ -1259,10 +1262,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
-              metadata: _objectSpread({
+              metadata: _objectSpread(_objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
+              }), {}, {
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               })
             };
             appliedProducts.push(discountDetail);
@@ -1348,6 +1353,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1432,6 +1438,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference

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

@@ -0,0 +1,32 @@
+import dayjs from "dayjs";
+import { ScheduleItem } from "./types";
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+export type ScheduleTimeSlot = {
+    /** 开始时间 HH:mm */
+    start_time: string;
+    /** 结束时间 HH:mm */
+    end_time: string;
+    /** 开始日期时间 YYYY-MM-DD HH:mm:ss */
+    start_at: dayjs.Dayjs;
+    /** 结束日期时间 YYYY-MM-DD HH:mm:ss */
+    end_at: dayjs.Dayjs;
+};
+/**
+ * 获取当前日期日程时间点
+ * @param date 日期 YYYY-MM-DD
+ * @param scheduleList 日程列表
+ * @returns 当前日期日程时间点 结构，数组 [{
+ *
+ *  // HH:mm
+ *  end_time: string,
+ *  // HH:mm
+ *  start_time: string,
+ *  // 日期时间
+ *  // YYYY-MM-DD HH:mm:ss
+ *  end_at: Dayjs,
+ *  // YYYY-MM-DD HH:mm:ss
+ *  start_at: Dayjs,
+ *
+ * }]
+ */
+export declare const getScheduleStartEndTimePoints: (date: string, scheduleList: ScheduleItem[]) => ScheduleTimeSlot[];