@pisell/pisellos 0.0.128 → 0.0.129

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

@@ -17,6 +17,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;
+        with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
     batchSearch(code: string): Promise<Discount[]>;

package/dist/modules/Discount/index.js

@@ -1,4 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -18,6 +24,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { BaseModule } from "../BaseModule";
 import { DiscountHooks } from "./types";
+import Decimal from 'decimal.js';
 export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(DiscountModule, _BaseModule);
   var _super = _createSuper(DiscountModule);
@@ -113,7 +120,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _prepareConfig$data;
+        var _prepareConfig$data, _prepareConfig$data2;
         var prepareConfig, goodPassList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -122,9 +129,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || [];
+              goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || [];
+              this.setDiscountList(goodPassList);
               return _context3.abrupt("return", goodPassList);
-            case 5:
+            case 6:
             case "end":
               return _context3.stop();
           }
@@ -147,7 +155,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/machinecode/batch-search", {
                 code: code,
                 translate_flag: 1,
-                tag: 'good_pass',
+                tags: ['good_pass', 'product_discount_card'],
                 available: 1,
                 relation_product: 1
               });
@@ -170,7 +178,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
       return discountList.filter(function (discount) {
-        return discount.limit_status === 'enable' && Number((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0) - Number((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0) > 0;
+        return discount.limit_status === 'enable' && new Decimal((discount === null || discount === void 0 ? void 0 : discount.par_value) || 0).minus(new Decimal((discount === null || discount === void 0 ? void 0 : discount.used_par_value) || 0)).greaterThan(0);
       });
     }
 
@@ -198,8 +206,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var price = Number(product === null || product === void 0 ? void 0 : product.amount) || 0;
-          return total + price;
+          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0);
+          return new Decimal(total).plus(price).toNumber();
         }, 0);
       }
     }

package/dist/modules/Rules/index.js

@@ -27,6 +27,7 @@ import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
+import Decimal from 'decimal.js';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -163,24 +164,49 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return !discount.isManualSelect;
       });
 
-      // 优惠券按过期时间排序（即将过期优先）
+      // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
+      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
+      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
-        if (a.expire_time && b.expire_time) {
-          var timeA = new Date(a.expire_time).getTime();
-          var timeB = new Date(b.expire_time).getTime();
-          return timeA - timeB;
+        // 1. 商品券优先级最高
+        if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
+        if (b.tag === 'good_pass' && a.tag !== 'good_pass') return 1;
+
+        // 2. 如果都是商品券或都不是商品券，按照类型和折扣力度排序
+        if (a.tag === 'good_pass' && b.tag === 'good_pass') {
+          // 都是商品券，按照过期时间排序
+          return compareByExpireTime(a, b);
+        } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
+          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
+          if (a.par_value !== b.par_value) {
+            var valueA = new Decimal(a.par_value || 0);
+            var valueB = new Decimal(b.par_value || 0);
+            return valueA.minus(valueB).toNumber();
+          }
+          // 相同折扣的情况下，按照过期时间排序
+          return compareByExpireTime(a, b);
+        }
+
+        // 3. 其他情况按照过期时间排序
+        return compareByExpireTime(a, b);
+        function compareByExpireTime(itemA, itemB) {
+          if (itemA.expire_time && itemB.expire_time) {
+            var timeA = new Date(itemA.expire_time).getTime();
+            var timeB = new Date(itemB.expire_time).getTime();
+            return timeA - timeB;
+          }
+          // 有过期时间的优先级高于永久的
+          return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
         }
-        // 有过期时间的优先级高于永久的
-        return a.expire_time ? -1 : b.expire_time ? 1 : 0;
       });
 
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedProductList = _toConsumableArray(productList).sort(function (a, b) {
         var aProduct = _this3.hooks.getProduct(a);
         var bProduct = _this3.hooks.getProduct(b);
-        var priceA = parseFloat(aProduct.price || '0');
-        var priceB = parseFloat(bProduct.price || '0');
-        return priceB - priceA;
+        var priceA = new Decimal(aProduct.price || '0');
+        var priceB = new Decimal(bProduct.price || '0');
+        return priceB.minus(priceA).toNumber();
       });
 
       // 标记已使用的优惠券
@@ -233,7 +259,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
-                original_amount: product.origin_total
+                original_amount: product.origin_total,
+                pre_value: discount.par_value
               }
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
@@ -321,14 +348,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 记录实际应用了优惠券的商品信息
         var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+        var targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
         var discountDetail = {
-          amount: product.price,
-          type: selectedDiscount.tag,
+          amount: selectedDiscount.tag === 'product_discount_card' ? new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber() : product.price,
+          type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
           discount: {
             resource_id: selectedDiscount.id,
             title: selectedDiscount.format_title,
-            original_amount: product.origin_total,
-            product_id: selectedDiscount.product_id
+            original_amount: product.price,
+            product_id: selectedDiscount.product_id,
+            percent: selectedDiscount.par_value
           }
         };
         appliedProducts.push(discountDetail);
@@ -339,7 +368,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (product.isClient) {
           processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: new Decimal(targetProductPrice).toNumber(),
             origin_total: getProductOriginTotalPrice({
               product: {
                 original_price: product.original_price
@@ -349,7 +378,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }),
             total: getProductTotalPrice({
               product: {
-                price: '0'
+                price: targetProductPrice
               },
               bundle: product.bundle,
               options: product.options
@@ -358,8 +387,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         } else {
           processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
+            price: new Decimal(targetProductPrice).toNumber(),
+            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0)).toNumber(),
             origin_total: product.origin_total || product.total
           }));
         }

package/dist/solution/BookingByStep/index.js

@@ -2592,7 +2592,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         _ref11$quantity = _ref11.quantity,
         quantity = _ref11$quantity === void 0 ? 1 : _ref11$quantity;
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
-        product_variant_id: product_variant_id
+        product_variant_id: product_variant_id,
+        rowKey: rowKey
       });
       if (!account) {
         var activeAccount = this.getActiveAccount();
@@ -2611,7 +2612,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _id: targetCartItem._id,
             product: _objectSpread(_objectSpread({}, targetCartItem._productOrigin), {}, {
               quantity: (targetCartItem.num || 1) + quantity
-            })
+            }),
+            bundle: targetCartItem._bundleOrigin,
+            options: targetCartItem._optionsOrigin,
+            quantity: (targetCartItem.num || 1) + quantity
           });
           return;
         }
@@ -2949,6 +2953,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           startDate,
           endDate,
           endDateAfterMonth,
+          tempEndDate,
           tempProducts,
           schedule,
           filteredSchedule,
@@ -2976,17 +2981,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 优化策略：
               // 在 endDate 添加完一个月以后，如果 endDate 还小于 startDate + 7 天，则还需要 endDate+7 天
               endDateAfterMonth = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              tempEndDate = endDateAfterMonth;
               if (dayjs(startDate).add(7, 'day').isAfter(dayjs(endDateAfterMonth), 'day')) {
-                endDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
+                tempEndDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
               } else {
-                endDate = endDateAfterMonth;
+                tempEndDate = endDateAfterMonth;
+              }
+              // 如果这么算出来的 tempEndDate 还小于 endDate，则需要把 endDate 置为 tempEndDate
+              if (dayjs(tempEndDate).isBefore(dayjs(endDate), 'day')) {
+                tempEndDate = endDate || '';
               }
+              endDate = tempEndDate;
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
               tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
               schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 11;
+              _context32.next = 14;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2994,17 +3005,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 11:
+            case 14:
               res = _context32.sent;
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
               // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
               cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
               if (!cache) {
-                _context32.next = 17;
+                _context32.next = 20;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 17;
+                _context32.next = 20;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
@@ -3012,7 +3023,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
-            case 17:
+            case 20:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -3139,22 +3150,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 25:
+            case 28:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 31;
+                _context32.next = 34;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 27);
-            case 27:
+              return _context32.delegateYield(_loop3(), "t0", 30);
+            case 30:
               if (!_context32.t0) {
-                _context32.next = 29;
+                _context32.next = 32;
                 break;
               }
-              return _context32.abrupt("break", 31);
-            case 29:
-              _context32.next = 25;
+              return _context32.abrupt("break", 34);
+            case 32:
+              _context32.next = 28;
               break;
-            case 31:
+            case 34:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3170,7 +3181,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 35:
+            case 38:
             case "end":
               return _context32.stop();
           }

package/dist/solution/ShopDiscount/index.js

@@ -1,7 +1,5 @@
-var _excluded = ["wallet_pass_list"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -196,7 +194,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         _this2.loadPrepareConfig({
           customerId: customer.id,
           action: 'create',
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       });
     }
@@ -473,14 +472,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var result, _result$data, wallet_pass_list, customer;
+        var result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.prev = 0;
               _context7.next = 3;
-              return this.request.get("/customer/info/wallet/".concat(id), {
-                wallet_pass_tags: ['good_pass']
+              return this.request.get("/customer/info/".concat(id), {
+                with_trashed: 1
               });
             case 3:
               result = _context7.sent;
@@ -488,7 +487,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 _context7.next = 9;
                 break;
               }
-              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
               this.setCustomer(customer);
               _context7.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
@@ -526,7 +525,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
-                with_good_pass: 1
+                with_good_pass: 1,
+                with_discount_card: 1
               });
             case 4:
               goodPassList = _context8.sent;

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

@@ -17,6 +17,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;
+        with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
     batchSearch(code: string): Promise<Discount[]>;

package/lib/modules/Discount/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Discount/index.ts
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(Discount_exports);
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
+var import_decimal = __toESM(require("decimal.js"));
 var DiscountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -68,21 +79,22 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return this.store.discountList;
   }
   async loadPrepareConfig(params) {
-    var _a;
+    var _a, _b;
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
       params
     );
     const goodPassList = this.filterEnabledDiscountList(
-      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
+      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
+    this.setDiscountList(goodPassList);
     return goodPassList;
   }
   async batchSearch(code) {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
-      tag: "good_pass",
+      tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1
     });
@@ -91,7 +103,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => discount.limit_status === "enable" && Number((discount == null ? void 0 : discount.par_value) || 0) - Number((discount == null ? void 0 : discount.used_par_value) || 0) > 0
+      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0)
     );
   }
   // 根据productIds去重
@@ -110,8 +122,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = Number(product == null ? void 0 : product.amount) || 0;
-        return total + price;
+        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0);
+        return new import_decimal.default(total).plus(price).toNumber();
       }, 0);
     }
   }

package/lib/modules/Rules/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Rules/index.ts
@@ -26,6 +36,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -107,19 +118,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      if (a.expire_time && b.expire_time) {
-        const timeA = new Date(a.expire_time).getTime();
-        const timeB = new Date(b.expire_time).getTime();
-        return timeA - timeB;
+      if (a.tag === "good_pass" && b.tag !== "good_pass")
+        return -1;
+      if (b.tag === "good_pass" && a.tag !== "good_pass")
+        return 1;
+      if (a.tag === "good_pass" && b.tag === "good_pass") {
+        return compareByExpireTime(a, b);
+      } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
+        if (a.par_value !== b.par_value) {
+          const valueA = new import_decimal.default(a.par_value || 0);
+          const valueB = new import_decimal.default(b.par_value || 0);
+          return valueA.minus(valueB).toNumber();
+        }
+        return compareByExpireTime(a, b);
+      }
+      return compareByExpireTime(a, b);
+      function compareByExpireTime(itemA, itemB) {
+        if (itemA.expire_time && itemB.expire_time) {
+          const timeA = new Date(itemA.expire_time).getTime();
+          const timeB = new Date(itemB.expire_time).getTime();
+          return timeA - timeB;
+        }
+        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
       }
-      return a.expire_time ? -1 : b.expire_time ? 1 : 0;
     });
     const sortedProductList = [...productList].sort((a, b) => {
       const aProduct = this.hooks.getProduct(a);
       const bProduct = this.hooks.getProduct(b);
-      const priceA = parseFloat(aProduct.price || "0");
-      const priceB = parseFloat(bProduct.price || "0");
-      return priceB - priceA;
+      const priceA = new import_decimal.default(aProduct.price || "0");
+      const priceB = new import_decimal.default(bProduct.price || "0");
+      return priceB.minus(priceA).toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -146,7 +174,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
-              original_amount: product.origin_total
+              original_amount: product.origin_total,
+              pre_value: discount.par_value
             }
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
@@ -220,14 +249,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       usedDiscounts.set(selectedDiscount.id, true);
       const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+      const targetProductPrice = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
       const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
+        amount: selectedDiscount.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+        type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : selectedDiscount.tag,
         discount: {
           resource_id: selectedDiscount.id,
           title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
+          original_amount: product.price,
+          product_id: selectedDiscount.product_id,
+          percent: selectedDiscount.par_value
         }
       };
       appliedProducts.push(discountDetail);
@@ -237,7 +268,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -247,7 +278,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }),
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
-                price: "0"
+                price: targetProductPrice
               },
               bundle: product.bundle,
               options: product.options
@@ -259,8 +290,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
+            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0)).toNumber(),
             origin_total: product.origin_total || product.total
           })
         );

package/lib/solution/BookingByStep/index.js

@@ -1796,7 +1796,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     const { bundle, options, origin, product_variant_id, rowKey, quantity = 1 } = product || {};
-    const productData = { ...origin, product_variant_id };
+    const productData = { ...origin, product_variant_id, rowKey };
     if (!account) {
       const activeAccount = this.getActiveAccount();
       if (activeAccount) {
@@ -1815,7 +1815,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           product: {
             ...targetCartItem._productOrigin,
             quantity: (targetCartItem.num || 1) + quantity
-          }
+          },
+          bundle: targetCartItem._bundleOrigin,
+          options: targetCartItem._optionsOrigin,
+          quantity: (targetCartItem.num || 1) + quantity
         });
         return;
       }
@@ -2076,11 +2079,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     const endDateAfterMonth = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    let tempEndDate = endDateAfterMonth;
     if ((0, import_dayjs.default)(startDate).add(7, "day").isAfter((0, import_dayjs.default)(endDateAfterMonth), "day")) {
-      endDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
+      tempEndDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
     } else {
-      endDate = endDateAfterMonth;
+      tempEndDate = endDateAfterMonth;
+    }
+    if ((0, import_dayjs.default)(tempEndDate).isBefore((0, import_dayjs.default)(endDate), "day")) {
+      tempEndDate = endDate || "";
     }
+    endDate = tempEndDate;
     let tempProducts;
     tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
     const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];

package/lib/solution/ShopDiscount/index.js

@@ -118,7 +118,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.loadPrepareConfig({
           customerId: customer.id,
           action: "create",
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       }
     );
@@ -303,11 +304,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 获取客户钱包信息
   async getCustomerWallet(id) {
     try {
-      const result = await this.request.get(`/customer/info/wallet/${id}`, {
-        wallet_pass_tags: ["good_pass"]
+      const result = await this.request.get(`/customer/info/${id}`, {
+        with_trashed: 1
       });
       if (result == null ? void 0 : result.data) {
-        const { wallet_pass_list, ...customer } = result.data;
+        const { ...customer } = result.data;
         this.setCustomer(customer);
         await this.core.effects.emit(
           import_types.ShopDiscountHooks.onScanCustomerChange,
@@ -326,7 +327,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",
-        with_good_pass: 1
+        with_good_pass: 1,
+        with_discount_card: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

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