@pisell/pisellos 2.2.251 → 2.2.253

package/dist/modules/Order/index.js

@@ -1369,6 +1369,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (normalizedStatus !== 'refunded' && normalizedStatus !== 'partially_refunded') {
         return false;
       }
+      if (normalizedStatus === 'refunded' && params.paymentTotal.gt(0) && params.refundAmount.gte(params.paymentTotal)) {
+        return true;
+      }
       if (params.previousSummary) {
         var previousTargetAmount = this.calculatePaymentTargetAmount(params.tempOrder, params.previousSummary, params.netPaymentTotal);
         if (!previousTargetAmount.eq(params.targetAmount)) return false;
@@ -5303,6 +5306,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context42.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
+              }, {
+                osServer: true
               });
             case 2:
               res = _context42.sent;

package/dist/modules/Rules/index.js

@@ -928,7 +928,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: originProduct.id,
+                product_id: originProduct.id || originProduct.product_id,
                 discount_product_id: discount.product_id
               },
               metadata: {
@@ -1394,7 +1394,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 resource_id: _selectedDiscount.id,
                 title: _selectedDiscount.format_title,
                 original_amount: product.price,
-                product_id: originProduct.id,
+                product_id: originProduct.id || originProduct.product_id,
                 percent: _selectedDiscount.par_value,
                 discount_product_id: _selectedDiscount.product_id
               },
@@ -1473,6 +1473,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
               var discountedPrice = getDiscountAmount(_selectedDiscount2, product.origin_total, product.origin_total);
               var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
+              debugger;
               var _discountDetail = {
                 amount: bundleDiscountAmount,
                 type: 'good_pass',
@@ -1482,7 +1483,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   resource_id: _selectedDiscount2.id,
                   title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id,
+                  product_id: product.id || product.product_id,
                   discount_product_id: _selectedDiscount2.product_id
                 },
                 metadata: {
@@ -1555,6 +1556,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
+            debugger;
             var _discountDetail2 = {
               amount: fixedAmountPerItem * (product.num || 1),
               type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
@@ -1565,7 +1567,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 resource_id: _selectedDiscount3.id,
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
-                product_id: product.id,
+                product_id: product.id || product.product_id,
                 percent: _selectedDiscount3.par_value,
                 discount_product_id: _selectedDiscount3.product_id
               },

package/dist/server/modules/order/index.d.ts

@@ -32,10 +32,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

package/dist/server/modules/order/index.js

@@ -172,10 +172,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-    * 记录信息日志
-    * @param title 日志标题
-    * @param metadata 日志元数据
-    */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {

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

@@ -934,6 +934,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (normalizedStatus !== "refunded" && normalizedStatus !== "partially_refunded") {
       return false;
     }
+    if (normalizedStatus === "refunded" && params.paymentTotal.gt(0) && params.refundAmount.gte(params.paymentTotal)) {
+      return true;
+    }
     if (params.previousSummary) {
       const previousTargetAmount = this.calculatePaymentTargetAmount(
         params.tempOrder,
@@ -3848,6 +3851,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings"]
+    }, {
+      osServer: true
     });
     return res;
   }

package/lib/modules/Rules/index.js

@@ -630,7 +630,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
               pre_value: discount.par_value,
-              product_id: originProduct.id,
+              product_id: originProduct.id || originProduct.product_id,
               discount_product_id: discount.product_id
             },
             metadata: {
@@ -1047,7 +1047,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
-              product_id: originProduct.id,
+              product_id: originProduct.id || originProduct.product_id,
               percent: selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },
@@ -1120,6 +1120,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               product.origin_total
             );
             const bundleDiscountAmount = new import_decimal.default(product.origin_total || 0).minus(discountedPrice).toNumber();
+            debugger;
             const discountDetail = {
               amount: bundleDiscountAmount,
               type: "good_pass",
@@ -1129,7 +1130,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
-                product_id: product.id,
+                product_id: product.id || product.product_id,
                 discount_product_id: selectedDiscount2.product_id
               },
               metadata: {
@@ -1195,6 +1196,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           }
           const uniqueId = flatItem._id;
+          debugger;
           const discountDetail = {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
@@ -1205,7 +1207,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
-              product_id: product.id,
+              product_id: product.id || product.product_id,
               percent: selectedDiscount2.par_value,
               discount_product_id: selectedDiscount2.product_id
             },

package/lib/server/modules/order/index.d.ts

@@ -32,10 +32,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

package/lib/server/modules/order/index.js

@@ -110,10 +110,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   /**
-  * 记录信息日志
-  * @param title 日志标题
-  * @param metadata 日志元数据
-  */
+   * 记录信息日志
+   * @param title 日志标题
+   * @param metadata 日志元数据
+   */
   logInfo(title, metadata) {
     try {
       if (this.logger) {

package/package.json

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