@pisell/private-materials 6.6.61 → 6.6.63

package/lib/components/eftposPay/windcave/windcave.js

@@ -41,6 +41,7 @@ var import_hooks = require("../hooks");
 var import_store = require("../store");
 var import_const2 = require("./const");
 var import_helper2 = require("./helper");
+var import_payLog = __toESM(require("../utils/payLog"));
 var import_receiptAction = __toESM(require("./receiptAction"));
 var Minute = 1e3 * 60;
 var windcave_default = ({
@@ -69,7 +70,7 @@ var windcave_default = ({
   const stepRef = (0, import_react.useRef)(custom == null ? void 0 : custom.step);
   const listRef = (0, import_react.useRef)(custom == null ? void 0 : custom.list);
   const initRef = (0, import_react.useRef)(false);
-  const clearRef = (0, import_react.useRef)();
+  const clearRef = (0, import_react.useRef)(null);
   const isReceiptPage = (0, import_react.useMemo)(
     () => (custom == null ? void 0 : custom.step) === import_const2.StepStatusEnum.Receipt,
     [custom == null ? void 0 : custom.step]
@@ -144,8 +145,10 @@ var windcave_default = ({
     initRef.current = true;
     if (stepRef.current === import_const2.StepStatusEnum.Receipt) {
       if (import_const.StatusEnum.Loading === statusRef.current) {
+        import_payLog.default.log("Windcave：签名页面处于运行中(已发送签名,或取消签名接口),进行计时查询");
         run();
       } else {
+        import_payLog.default.log("Windcave：签名页面处于未加载中,进行无限查询");
         run(-1);
       }
       return;
@@ -155,7 +158,6 @@ var windcave_default = ({
       run();
       return;
     }
-    console.log("modeRef.current = ", modeRef.current);
     numRef.current = (0, import_helper.getUuid)();
     dispatch(
       (0, import_store.updateState)({
@@ -167,16 +169,16 @@ var windcave_default = ({
     if (isPay) {
       _params = {
         ...(custom == null ? void 0 : custom.platform) ? {
-          "operator_id": custom.operator_id,
-          "operator_type": custom.operator_type,
-          "platform": custom.platform,
-          "custom_payment_id": custom.custom_payment_id,
-          "service_charge": {
-            "amount": payRef.current.surMoney,
-            "percentage": payRef.current.surPercentRate
-          },
-          "original_amount": payRef.current.amount
+          operator_id: custom.operator_id,
+          operator_type: custom.operator_type,
+          platform: custom.platform,
+          custom_payment_id: custom.custom_payment_id
         } : {},
+        service_charge: {
+          amount: payRef.current.surMoney,
+          percentage: payRef.current.surPercentRate
+        },
+        original_amount: payRef.current.amount,
         order_id: orderIdRef.current,
         amount: payRef.current.total,
         card_reader_type: eftposRef.current,
@@ -212,24 +214,25 @@ var windcave_default = ({
         )
       };
     }
+    import_payLog.default.setContext({ transactionNumber: numRef.current });
+    if (isPay) {
+      import_payLog.default.log("Windcave：发起支付", { number: numRef.current });
+    } else {
+      import_payLog.default.log("Windcave：发起退款", { number: numRef.current });
+    }
     const resultPromise = isPay ? api.pay(_params, { signal: controllerRef.current.signal }) : api.refund(_params, { signal: controllerRef.current.signal });
     resultPromise.then((res) => {
-      var _a2, _b2;
+      var _a2, _b2, _c;
       if (unloadRef.current || !netRef.current) {
         return;
       }
       if (res && `${res.code}` === "200" && res.data && res.data.txn_status_id) {
-        (_a2 = validateRef.current) == null ? void 0 : _a2.call(validateRef, res, true);
+        import_payLog.default.log("Windcave：接口成功，进入轮询", { txn_status_id: (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.txn_status_id });
+        (_b2 = validateRef.current) == null ? void 0 : _b2.call(validateRef, res, true);
         return;
       }
-      (0, import_utils.sendWarningLog)({
-        title: "windcave支付失败",
-        content: [
-          { key: "res", value: JSON.stringify(res) },
-          { key: "params", value: JSON.stringify(_params) }
-        ]
-      });
-      (_b2 = failRef.current) == null ? void 0 : _b2.call(
+      import_payLog.default.log("Windcave：支付接口返回失败", { code: res == null ? void 0 : res.code });
+      (_c = failRef.current) == null ? void 0 : _c.call(
         failRef,
         res,
         stepRef.current >= import_const2.StepStatusEnum.Account
@@ -237,14 +240,7 @@ var windcave_default = ({
     }).catch((res) => {
       var _a2;
       let isNoNet = unloadRef.current || !netRef.current;
-      (0, import_utils.sendWarningLog)({
-        title: "windcave支付失败",
-        content: [
-          { key: "error", value: JSON.stringify(res) },
-          { key: "params", value: JSON.stringify(_params) },
-          { key: "isNoNet", value: isNoNet ? "1" : "0" }
-        ]
-      });
+      import_payLog.default.log("Windcave：支付接口异常", { error: res == null ? void 0 : res.message, isNoNet });
       if (isNoNet) {
         return;
       }
@@ -257,6 +253,7 @@ var windcave_default = ({
     return;
   }, [api, run, dispatch]);
   const onCancel = () => {
+    import_payLog.default.log("Windcave：点击取消支付");
     setDisabled(true);
     api.update({
       type: "CANCEL",
@@ -276,6 +273,7 @@ var windcave_default = ({
   );
   const onChangeReceipt = (status2) => {
     if (status2) {
+      import_payLog.default.log("Windcave：签名状态");
       run();
     }
   };

package/lib/components/ticketBooking/utils/formatProductMessage.js

@@ -24,7 +24,21 @@ __export(formatProductMessage_exports, {
 module.exports = __toCommonJS(formatProductMessage_exports);
 var import_utils = require("@pisell/utils");
 var import_formatTime = require("./formatTime");
+var import_utils2 = require("@pisell/utils");
+var UNIT_LABEL = {
+  KILOGRAMS: "kg",
+  GRAMS: "g",
+  POUNDS: "lb",
+  OUNCES: "oz"
+};
+var DEFAULT_WEIGHT_PRECISION = 3;
+var formatWeightValue = (value) => {
+  const parsedValue = Number(value);
+  const displayValue = Number.isFinite(parsedValue) ? parsedValue : 0;
+  return displayValue.toFixed(DEFAULT_WEIGHT_PRECISION);
+};
 var formatProductMessage = (product, utils) => {
+  var _a, _b;
   const {
     product_option_string,
     options,
@@ -64,6 +78,28 @@ var formatProductMessage = (product, utils) => {
       }
     });
   }
+  const weighing = (_b = (_a = product == null ? void 0 : product._origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.weighing;
+  if (weighing) {
+    const { mode, unit_price, unit, weight, tare, net_weight } = weighing;
+    const unitLabel = UNIT_LABEL[unit] || unit;
+    const weightText = formatWeightValue(weight);
+    const tareText = formatWeightValue(tare == null ? void 0 : tare.value);
+    const netWeightText = formatWeightValue(net_weight);
+    const tareValue = Number((tare == null ? void 0 : tare.value) || 0);
+    const isManualWeight = mode === "manual";
+    const unitPriceText = `${currency_symbol || ""}${unit_price ?? "0.00"}`;
+    const manualPrefix = isManualWeight ? "(M) " : "";
+    if (tareValue > 0) {
+      str += `${manualPrefix}${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.gross")}: ${weightText} ${unitLabel} 
+`;
+    }
+    if (tareValue > 0) {
+      str += `${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.tare")}: ${tareText} ${UNIT_LABEL[tare == null ? void 0 : tare.unit] || (tare == null ? void 0 : tare.unit) || unitLabel} 
+`;
+    }
+    str += `${tareValue > 0 ? "" : manualPrefix}${netWeightText} ${unitLabel} ${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.net")} @ ${unitPriceText}/${unitLabel} 
+`;
+  }
   if (product_option_string) str += `${product_option_string}
 `;
   if (Array.isArray(options) && options.length) {
@@ -74,9 +110,15 @@ var formatProductMessage = (product, utils) => {
   }
   if (Array.isArray(bundle) && bundle.length) {
     bundle.forEach((item) => {
-      str += `${item.title} 
+      str += `${item.title}  ${(0, import_utils.formatAmount)(item.price, 2, currency_symbol)} x ${item.num}
+`;
+      const bundleOptions = item == null ? void 0 : item.options;
+      if (Array.isArray(bundleOptions) && bundleOptions.length) {
+        bundleOptions.forEach((opt) => {
+          str += `  ${opt == null ? void 0 : opt.name}  ${(0, import_utils.formatAmount)(opt == null ? void 0 : opt.price, 2, currency_symbol)} x ${opt == null ? void 0 : opt.num}
 `;
-      str += `${(0, import_utils.formatAmount)(item.price, 2, currency_symbol)} x ${item.num}`;
+        });
+      }
     });
   }
   return str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.61",
+  "version": "6.6.63",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.6.16",
+    "@pisell/materials": "6.6.17",
+    "@pisell/utils": "3.0.2",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/utils": "3.0.2"
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/eftposPay/utils/log/index.d.ts

@@ -1,110 +0,0 @@
-export interface LogEntry {
-    /** 日志标题 */
-    title: string;
-    /** 日志内容 */
-    content?: any;
-    /** 支付时间（精确到毫秒） */
-    time: string;
-}
-interface PaymentLogRecord {
-    /** 交易记录号 */
-    number: string;
-    /** 订单ID */
-    orderId?: string | number;
-    /** 设备ID */
-    deviceId?: string | number;
-    /** 支付类型 */
-    paymentType?: string;
-    /** 创建时间 */
-    createdAt: string;
-    /** 日志条目列表 */
-    logs: LogEntry[];
-}
-declare class PaymentLogInstance {
-    private static instance;
-    /** 当前交易记录号 */
-    private currentNumber;
-    /** 当前日志记录 */
-    private currentRecord;
-    private constructor();
-    /**
-     * 获取单例实例
-     */
-    static getInstance(): PaymentLogInstance;
-    /**
-     * 初始化支付日志
-     * @param number 交易记录号
-     * @param options 初始化选项
-     */
-    init(number: string, options?: {
-        orderId?: string | number;
-        deviceId?: string | number;
-        paymentType?: string;
-        [key: string]: any;
-    }): void;
-    /**
-     * 添加日志条目
-     * @param title 日志标题
-     * @param content 日志内容
-     */
-    addLog(params: {
-        title: string;
-        content?: any;
-    }): void;
-    /**
-     * 构建日志内容
-     * @param record 日志记录
-     * @returns 格式化的日志内容数组
-     */
-    private buildLogContent;
-    /**
-     * 发送单条日志记录到飞书
-     * @param record 日志记录
-     * @param isRestore 是否是恢复上传
-     */
-    private sendLogRecord;
-    /**
-     * 发送日志到飞书
-     * @param title 日志标题（可选，仅在需要自定义标题时使用）
-     */
-    sendLogs(title?: string): void;
-    /**
-     * 清除当前日志
-     * @param shouldSend 清除前是否发送到飞书，默认为 true
-     */
-    clearLogs(shouldSend?: boolean): void;
-    /**
-     * 检查并上传旧日志
-     */
-    private checkAndUploadOldLogs;
-    /**
-     * 获取所有支付日志对象
-     */
-    private getAllLogsObject;
-    /**
-     * 保存所有支付日志对象
-     */
-    private saveAllLogsObject;
-    /**
-     * 保存到 localStorage
-     */
-    private saveToLocalStorage;
-    /**
-     * 从 localStorage 中删除
-     */
-    private removeFromLocalStorage;
-    /**
-     * 获取所有旧日志
-     */
-    private getOldLogsFromLocalStorage;
-    /**
-     * 获取当前日志记录（用于调试）
-     */
-    getCurrentRecord(): PaymentLogRecord | null;
-    /**
-     * 获取当前交易号（用于调试）
-     */
-    getCurrentNumber(): string | null;
-}
-declare const paymentLog: PaymentLogInstance;
-export default paymentLog;