cyymall-cli 0.1.11 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyymall-cli",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "CyyMall / 菜洋洋商城 API CLI (per app-api-cli-spec)",
   "bin": {
     "cyy": "bin/cyy.js"
@@ -19,7 +19,7 @@
   "scripts": {
     "start": "node bin/cyy.js",
     "lint": "node --check src/cli.js && node --check src/encrypt.js && node --check src/embeddedCyyKeys.js",
-    "prepublishOnly": "node --check src/cli.js && node --check src/encrypt.js && node --check src/embeddedCyyKeys.js && node --check bin/cyy.js"
+    "prepublishOnly": "node --check src/cli.js && node --check src/cartProduct.js && node --check src/encrypt.js && node --check src/embeddedCyyKeys.js && node --check bin/cyy.js"
   },
   "keywords": [
     "cyymall",

package/src/cartProduct.js

@@ -0,0 +1,90 @@
+"use strict";
+
+const http = require("./http");
+const biz = require("./biz");
+
+/**
+ * Search getSkuList; pick first hit; resolve price/unit from promotionList (matches `quick`/`checkout`).
+ * @param {Record<string, unknown>} cfg
+ * @param {{ keyword: string, shopId: number, siteId: number, quantity: number, unit: string }} opts
+ */
+async function resolveProductLine(cfg, opts) {
+  const { keyword, shopId, siteId, quantity, unit } = opts;
+  const headers = /** @type {Record<string,string>} */ (http.buildAuthHeaders(cfg));
+
+  const searchUrl = http.moduleUrl("PRODUCT", "/app/product/getSkuList");
+  const searchBody = JSON.stringify({
+    pageNum: 1,
+    pageSize: 10,
+    shopId,
+    siteId,
+    spuName: keyword,
+    stockFlag: "0",
+  });
+
+  const r = await http.request(searchUrl, {
+    method: "POST",
+    headers,
+    body: searchBody,
+  });
+  if (!r.ok || !biz.isBizSuccess(r.json)) {
+    /** @type {Error & { cause?: unknown }} */
+    const err = new Error(`search failed for "${keyword}"`);
+    err.cause = r.json;
+    throw err;
+  }
+
+  const list =
+    r.json &&
+    typeof r.json === "object" &&
+    r.json.data &&
+    typeof r.json.data === "object"
+      ? /** @type {{ list?: unknown[] }} */ (r.json.data).list
+      : [];
+  const products = Array.isArray(list) ? list : [];
+  if (!products.length) {
+    throw new Error(`no products found for "${keyword}"`);
+  }
+
+  const product = /** @type {Record<string, unknown>} */ (products[0]);
+  const skuId = Number(product.id);
+  const skuCode = String(product.skuCode || "");
+  const skuName = String(product.spuName || "");
+  const stockQty = Number(product.stockAllQuantity ?? 0);
+  const promotionList = Array.isArray(product.promotionList) ? product.promotionList : [];
+
+  let price = 0;
+  let unitRate = 1;
+  let skuSaleUnit = unit;
+  for (const p of promotionList) {
+    const row = /** @type {Record<string, unknown>} */ (p);
+    if (row.skuSaleUnitName === unit) {
+      price = Number(row.salePrice || 0);
+      unitRate = Number(row.unitRate ?? 1);
+      skuSaleUnit = String(row.skuSaleUnitName || unit);
+      break;
+    }
+  }
+  if (!price) {
+    const availableUnits = promotionList.map(
+      (x) => /** @type {{ skuSaleUnitName?: string }} */ (x).skuSaleUnitName,
+    );
+    const err = new Error(`unit "${unit}" not found in promotionList for "${keyword}"`);
+    /** @type {Error & { availableUnits?: (string | undefined)[] }} */ (err).availableUnits = availableUnits;
+    throw err;
+  }
+
+  return {
+    skuId,
+    skuCode,
+    skuName,
+    skuQty: quantity,
+    skuSaleUnit,
+    listPrice: price,
+    salePrice: price,
+    unitRate,
+    stockQty,
+  };
+}
+
+module.exports = { resolveProductLine };

package/src/commands/order.js

@@ -406,13 +406,27 @@ async function checkout(opts) {
   for (const spec of itemSpecs) {
     const kw = spec.keyword;
     if (!kw) continue;
-    const line = await resolveProductLine(cfg, {
-      keyword: kw,
-      shopId,
-      siteId,
-      quantity: Number(spec.quantity ?? quantity),
-      unit: String(spec.unit ?? unit),
-    });
+    let line;
+    try {
+      line = await resolveProductLine(cfg, {
+        keyword: kw,
+        shopId,
+        siteId,
+        quantity: Number(spec.quantity ?? quantity),
+        unit: String(spec.unit ?? unit),
+      });
+    } catch (e) {
+      const msg = /** @type {Error & { cause?: unknown, availableUnits?: unknown }} */ (
+        typeof e === "object" && e !== null ? e : { message: String(e) }
+      );
+      envelope(
+        false,
+        msg.message || String(e),
+        { keyword: kw, upstream: msg.cause, availableUnits: msg.availableUnits },
+        2,
+      );
+      return;
+    }
     lines.push(line);
     cartItemList.push({
       skuCode: line.skuCode,

package/src/Untitled

@@ -1 +0,0 @@
-shop