@kmkf-fe-packages/kmkf-utils 0.23.1-beta.3 → 0.23.1-beta.4

package/dist/esm/utils/wdtOrderBackFormValues.d.ts

@@ -24,4 +24,9 @@ export declare const wdtOrderTransform: (detail: any) => {
         selectIds: any;
         showOrderInfo: any;
     };
+    wdtGoods: {
+        wdtGoods: any;
+    };
+    wdtLogistics: any;
+    wdtSendGood: any;
 };

package/dist/esm/utils/wdtOrderBackFormValues.js

@@ -32,71 +32,42 @@ export var WDT_ORDER_TYPE_MAP = {
 };
 var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var list = orders.reduce(function (prv, next) {
-    var goods = next.items.map(function (item) {
-      var picPath = item.picPath,
-        code = item.code,
-        name = item.name,
-        skuCode = item.skuCode,
-        skuName = item.skuName,
-        giftType = item.giftType,
-        qty = item.qty,
-        amountShareSettle = item.amountShareSettle,
-        sharePrice = item.sharePrice;
-      return {
-        mark: "是",
-        skuName: skuName,
-        pic: picPath,
-        name: name,
-        code: code,
-        sku: skuCode,
-        money: amountShareSettle || 0,
-        number: qty,
-        share: sharePrice,
-        type: giftType,
-        canDelete: true,
-        uuid: uuid(),
-        billNo: next === null || next === void 0 ? void 0 : next.billNo,
-        billId: next === null || next === void 0 ? void 0 : next.billId
-      };
-    });
-    prv.push.apply(prv, _toConsumableArray(goods));
-    return prv;
+  return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
+    if (Array.isArray(cur.goodDetails)) {
+      acc.push.apply(acc, _toConsumableArray(cur.goodDetails.map(function (item) {
+        item.goodId = item.goodsId;
+        item.goodName = item.goodsName;
+        item.goodNo = item.goodsNo;
+        item.canDelete = true;
+        item.uuid = uuid();
+        return item;
+      })));
+    }
+    return acc;
   }, []);
-  //如果数量大于1 商品标记为否
-  if (list.length > 1) {
-    list = list.map(function (item) {
-      item.mark = "否";
-      return item;
-    });
-  }
-  return list;
 };
 var updateWdtItemListHandle = function updateWdtItemListHandle(list, type) {
   var _newList;
   var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
-    var items = (next.items || []).map(function (t) {
+    var items = (next.goodDetails || []).map(function (t) {
       return {
-        title: (t === null || t === void 0 ? void 0 : t.name) || "",
-        picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
+        title: (t === null || t === void 0 ? void 0 : t.goodsName) || "",
+        picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
         platform: "wdt",
-        skuId: (t === null || t === void 0 ? void 0 : t.singleProductId) || ""
-      };
-    });
-    var advList = (next.advancedDistributionInfos || []).map(function (item) {
-      var params = {
-        items: items
+        skuId: (t === null || t === void 0 ? void 0 : t.specId) || ""
       };
-      if (type === "logistics") {
-        params.logisticsCompany = ExpressData.getInstance().getExpressCodeByName(item.logisticCompany);
-        params.logisticsCode = item === null || item === void 0 ? void 0 : item.deliveryNo;
-      } else if (type === "send") {
-        params.sendId = item.wareHouseRealCode;
-        params.sendName = item.wareHouseRealName;
-      }
-      return params;
     });
-    prv.push.apply(prv, _toConsumableArray(advList));
+    var params = {
+      items: items
+    };
+    if (type === "logistics") {
+      params.logisticsCompany = ExpressData.getInstance().getExpressCodeByName(next.logisticsName);
+      params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticsNo;
+    } else if (type === "send") {
+      params.sendId = next.warehouseNo;
+      params.sendName = next.warehouseName;
+    }
+    prv.push(params);
     return prv;
   }, []);
   if (!((_newList = newList) !== null && _newList !== void 0 && _newList.length)) {
@@ -168,6 +139,7 @@ var updateWdtItemListByConfigHandle = function updateWdtItemListByConfigHandle(l
 export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
   var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  console.log('[ wdtOrderBackFormValues detail] >', detail);
   return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
     var uniqueKey = next.uniqueKey;
     var config = next.componentConfig;
@@ -175,6 +147,17 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
       case "WDT_SYSTEM_ORDER":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtSystemOrder;
         break;
+      case "WDT_GOODS":
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtGoods;
+        break;
+      case "WDT_REISSUE_GOODS":
+        prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtReissueGoods;
+        break;
+      case "WDT_LOGISTICS":
+        prv[uniqueKey] = updateWdtItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.wdtLogistics, "logistics", config);
+        break;
+      case "WDT_SEND_GOOD":
+        prv[uniqueKey] = updateWdtItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.wdtSendGood, "send", config);
       // case "WDT_SIGNING_TIME":
       //   prv[uniqueKey] = detail?.wdtSingingTime;
       //   break;
@@ -193,32 +176,12 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
       // case "WDT_PACKAGE_WEIGHT":
       //   prv[uniqueKey] = detail?.wdtPackageWeight;
       //   break;
-      // case "WDT_GOODS":
-      //   prv[uniqueKey] = detail?.wdtGoods;
-      //   break;
       // case "WDT_EXCHANGE_GOODS":
       //   prv[uniqueKey] = detail?.wdtExchangeGoods;
       //   break;
-      // case "WDT_REISSUE_GOODS":
-      //   prv[uniqueKey] = detail?.wdtReissueGoods;
-      //   break;
       // case "WDT_RETURN_GOODS":
       //   prv[uniqueKey] = detail?.wdtReturnGoods;
       //   break;
-      // case "WDT_LOGISTICS":
-      //   prv[uniqueKey] = updateWdtItemListByConfigHandle(
-      //     detail?.wdtLogistics,
-      //     "logistics",
-      //     config
-      //   );
-      //   break;
-      // case "WDT_SEND_GOOD":
-      //   prv[uniqueKey] = updateWdtItemListByConfigHandle(
-      //     detail?.wdtSendGood,
-      //     "send",
-      //     config
-      //   );
-
       //   break;
       // case "WDT_DELIVERY_NO":
       //   prv[uniqueKey] = detail?.wdtDeliveryNo;
@@ -246,7 +209,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail) {
         return _objectSpread(_objectSpread({}, item), {}, {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tradeTag
+          billTag: item.tagName
         });
       }),
       selectIds: (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1 ? detail === null || detail === void 0 ? void 0 : detail.trades.map(function (item) {
@@ -256,10 +219,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail) {
         return {
           billNo: item.tradeNo,
           billType: WDT_ORDER_TYPE_MAP[item.tradeType],
-          billTag: item.tradeTag
+          billTag: item.tagName
         };
       })
-    }
+    },
+    wdtGoods: {
+      // shopCode: detail?.shopCode,
+      wdtGoods: updateWdtGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.trades)
+    },
+    wdtLogistics: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "logistics"),
+    wdtSendGood: updateWdtItemListHandle(detail === null || detail === void 0 ? void 0 : detail.trades, "send")
     // wdtSingingTime: detail?.receiptDate,
     // wdtSendTime:
     //   detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,
@@ -278,10 +247,6 @@ export var wdtOrderTransform = function wdtOrderTransform(detail) {
     //     prv += number || 0;
     //     return prv;
     //   }, 0) || null,
-    // wdtGoods: {
-    //   shopCode: detail?.shopCode,
-    //   wdtGoods: updateWdtGoodsHandle(detail?.orders),
-    // },
     // wdtExchangeGoods: {
     //   shopCode: detail?.shopCode,
     //   wdtExchangeType: [],
@@ -299,8 +264,6 @@ export var wdtOrderTransform = function wdtOrderTransform(detail) {
     //   wdtReturnType: [],
     //   wdtReturnGoods: [],
     // },
-    // wdtLogistics: updateWdtItemListHandle(detail?.orders, "logistics"),
-    // wdtSendGood: updateWdtItemListHandle(detail?.orders, "send"),
     // wdtDeliveryNo: updateWdtSystemItemListHandle(detail?.orders, "delivery"),
     // wdtPosting: {
     //   postingAddress:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "0.23.1-beta.3",
+  "version": "0.23.1-beta.4",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -40,7 +40,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0402084934b9b8e089b5d0f6b0679059653bf189",
+  "gitHead": "56b3acff5ed4c12ca1c75551c33ada7769547a18",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }