@pisell/pisellos 2.2.186 → 2.2.187

package/dist/modules/Order/index.js

@@ -1156,12 +1156,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateTempOrderPaymentStatus",
     value: function updateTempOrderPaymentStatus(tempOrder) {
       var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+      var targetAmount = this.getPaymentTargetAmount();
+      if (targetAmount.lte(0)) {
+        tempOrder.payment_status = 'paid';
+        return;
+      }
       if (paymentTotal.lte(0)) {
         tempOrder.payment_status = tempOrder.payment_status || 'payment_processing';
         return;
       }
-      var targetAmount = this.getPaymentTargetAmount();
-      tempOrder.payment_status = targetAmount.gt(0) && paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
+      tempOrder.payment_status = paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
     }
   }, {
     key: "calculatePaidPaymentSummary",
@@ -2715,7 +2719,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
               paymentTotal = this.calculatePaymentTotal(mappedPayments);
               targetAmount = this.getPaymentTargetAmount();
-              isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
+              isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
               paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
               tempOrder.payments = mappedPayments;
               tempOrder.payment_status = paymentStatus;

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

@@ -180,6 +180,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
     getOrderPayments(): OrderPaymentData[];

package/dist/solution/BaseSales/index.js

@@ -1790,7 +1790,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(params) {
         var _this$otherParams6, _this$otherParams7, _this$otherParams8;
-        var submitParams;
+        var inferredPaymentStatus, submitParams;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
@@ -1801,6 +1801,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('BaseSales 解决方案需要 order 模块支持');
             case 2:
               this.store.order.persistTempOrder();
+              inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
@@ -1809,8 +1810,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 type: (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.type
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
-              } : {}), (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined ? {
-                paymentStatus: params.paymentStatus
+              } : {}), inferredPaymentStatus !== undefined ? {
+                paymentStatus: inferredPaymentStatus
               } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
                 smallTicketDataFlag: params.smallTicketDataFlag
               } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
@@ -1818,7 +1819,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } : {});
               console.log(submitParams, 'submitParams123');
               return _context18.abrupt("return", this.store.order.submitTempOrder(submitParams));
-            case 6:
+            case 7:
             case "end":
               return _context18.stop();
           }
@@ -1829,6 +1830,19 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return submitSalesOrder;
     }())
+  }, {
+    key: "getSubmitPaymentStatus",
+    value: function getSubmitPaymentStatus(paymentStatus) {
+      var _this$store$order3, _this$store$order3$ge;
+      if (paymentStatus !== undefined) return paymentStatus;
+      var amountSnapshot = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getOrderAmountSnapshot) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
+      if (!amountSnapshot) return undefined;
+      try {
+        return new Decimal(amountSnapshot.amountGap || 0).lte(0) ? 'paid' : undefined;
+      } catch (_unused2) {
+        return undefined;
+      }
+    }
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
@@ -1978,8 +1992,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order3, _tempOrder$products, _tempOrder$products2;
-      var tempOrder = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder();
+      var _this$store$order4, _tempOrder$products, _tempOrder$products2;
+      var tempOrder = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
       // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
       var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
@@ -2555,16 +2569,16 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getUnfulfilledPromotions",
     value: function getUnfulfilledPromotions() {
-      var _this$store$order4;
-      return ((_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getUnfulfilledPromotions()) || [];
+      var _this$store$order5;
+      return ((_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getUnfulfilledPromotions()) || [];
     }
 
     /** 最近一次促销计算输出的赠品操作 diff。 */
   }, {
     key: "getLastGiftActions",
     value: function getLastGiftActions() {
-      var _this$store$order5;
-      return ((_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getLastGiftActions()) || null;
+      var _this$store$order6;
+      return ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getLastGiftActions()) || null;
     }
 
     // 获取商品列表

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 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-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)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  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/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

package/lib/modules/Order/index.js

@@ -719,12 +719,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   updateTempOrderPaymentStatus(tempOrder) {
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const targetAmount = this.getPaymentTargetAmount();
+    if (targetAmount.lte(0)) {
+      tempOrder.payment_status = "paid";
+      return;
+    }
     if (paymentTotal.lte(0)) {
       tempOrder.payment_status = tempOrder.payment_status || "payment_processing";
       return;
     }
-    const targetAmount = this.getPaymentTargetAmount();
-    tempOrder.payment_status = targetAmount.gt(0) && paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
+    tempOrder.payment_status = paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
   }
   calculatePaidPaymentSummary(payments) {
     return (payments || []).reduce(
@@ -1945,7 +1949,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const paymentTotal = this.calculatePaymentTotal(mappedPayments);
     const targetAmount = this.getPaymentTargetAmount();
-    const isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
+    const isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
     const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
     tempOrder.payments = mappedPayments;
     tempOrder.payment_status = paymentStatus;

package/lib/solution/BaseSales/index.d.ts

@@ -180,6 +180,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         smallTicketDataFlag?: number;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     /** 读取当前 BaseSales 订单上下文中的 Sales 协议支付项。 */
     getOrderPayments(): OrderPaymentData[];

package/lib/solution/BaseSales/index.js

@@ -1073,6 +1073,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
     this.store.order.persistTempOrder();
+    const inferredPaymentStatus = this.getSubmitPaymentStatus(params == null ? void 0 : params.paymentStatus);
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
@@ -1080,13 +1081,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       channel: this.getSubmitOrderSalesChannel(),
       type: (_c = this.otherParams) == null ? void 0 : _c.type,
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
-      ...(params == null ? void 0 : params.paymentStatus) !== void 0 ? { paymentStatus: params.paymentStatus } : {},
+      ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     console.log(submitParams, "submitParams123");
     return this.store.order.submitTempOrder(submitParams);
   }
+  getSubmitPaymentStatus(paymentStatus) {
+    var _a, _b;
+    if (paymentStatus !== void 0)
+      return paymentStatus;
+    const amountSnapshot = (_b = (_a = this.store.order) == null ? void 0 : _a.getOrderAmountSnapshot) == null ? void 0 : _b.call(_a);
+    if (!amountSnapshot)
+      return void 0;
+    try {
+      return new import_decimal.default(amountSnapshot.amountGap || 0).lte(0) ? "paid" : void 0;
+    } catch {
+      return void 0;
+    }
+  }
   async syncPaymentsToOrder(params) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");

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 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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