@kmkf-fe-packages/kmkf-utils 2.7.3-beta.0 → 2.7.3-beta.4

package/README.md

@@ -1 +1 @@
-1123111123
+112311112311

package/dist/esm/utils/SendData.js

@@ -90,6 +90,7 @@ export var SendDataCenter = /*#__PURE__*/function () {
       if (platform === "JST_SEND_GOOD") platform = "jst";
       if (platform === "JY_SEND_GOOD") platform = "jy";
       if (platform === "JKY_SEND_GOOD") platform = "jky";
+      if (platform === "WLN_SEND_GOOD") platform = "wln";
       if (!this.instanceMap.has(platform)) {
         this.instanceMap.set(platform, new SendData(platform));
       }

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

@@ -9,9 +9,15 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
         width: number;
     }[];
 };
-export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
+export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
+export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
+    canEdit?: boolean;
+    orderBackGoodsLevel?: string;
+}) => any;
 export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
 export declare const wlnOrderTransform: (detail: any, form: any) => {
+    jstReissueGoods: any;
+    wlnReissueGoods: any;
     wlnSystemOrder: {
         orderNo: any;
         orders: any;

package/dist/esm/utils/wlnOrderBackFormValues.js

@@ -15,6 +15,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import ExpressData from "../expressData";
 import uuid from "./getUUid";
+import isNull from "./isNull";
 export var WLN_SYSTEM_ORDER_CONFIG = {
   key: "wlnSystemShowOrder",
   name: "万里牛",
@@ -82,36 +83,85 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
     width: 150
   }]
 };
+export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
+  var getSortedList = function getSortedList(str) {
+    try {
+      var parts = str.split(";");
+      var bigInts = parts.map(BigInt);
+      var sortedBigInts = bigInts.sort(function (a, b) {
+        if (a < b) return -1;
+        if (a > b) return 1;
+        return 0;
+      });
+      return sortedBigInts.map(String).join(";");
+    } catch (error) {
+      return "";
+    }
+  };
+  var platformCodesSortStr = getSortedList(platformCodes || "");
+  var orderNosSortStr = getSortedList(orderNos || "");
+  return platformCodesSortStr.includes(orderNosSortStr);
+};
 export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
   var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    canEdit: false,
+    orderBackGoodsLevel: "1"
+  };
+  console.log('*** updateWlnGoodsHandle');
+  var wrapItem = function wrapItem(item, systemOrderNo) {
+    item.uuid = item.uuid || uuid();
+    item.systemOrderNo = systemOrderNo;
+    item.canDelete = true;
+    item.canEdit = !!options.canEdit;
+    var picPath = item.picPath,
+      itemId = item.itemId,
+      itemName = item.itemName,
+      skuId = item.skuId,
+      skuName = item.skuName,
+      isGift = item.isGift,
+      size = item.size,
+      payment = item.payment,
+      price = item.price,
+      others = _objectWithoutProperties(item, _excluded);
+    return _objectSpread(_objectSpread({}, others), {}, {
+      skuName: skuName,
+      pic: picPath,
+      name: itemName,
+      code: itemId,
+      sku: skuId,
+      money: payment || 0,
+      number: size,
+      share: price,
+      type: isGift
+    });
+  };
   var list = orders.reduce(function (prv, next) {
-    var goods = next.items.map(function (item) {
-      item.uuid = item.uuid || uuid();
-      item.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
-      var picPath = item.picPath,
-        itemId = item.itemId,
-        itemName = item.itemName,
-        skuId = item.skuId,
-        skuName = item.skuName,
-        isGift = item.isGift,
-        size = item.size,
-        payment = item.payment,
-        price = item.price,
-        others = _objectWithoutProperties(item, _excluded);
-      return _objectSpread(_objectSpread({}, others), {}, {
-        skuName: skuName,
-        pic: picPath,
-        name: itemName,
-        code: itemId,
-        sku: skuId,
-        money: payment || 0,
-        number: size,
-        share: price,
-        type: isGift,
-        canDelete: true
+    if (options.orderBackGoodsLevel !== "2") {
+      var _next$items;
+      // 反填子商品
+      next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
+        if (item.skuType === 'combine') {
+          item.subItems.forEach(function (subItem) {
+            var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
+            // TODO: 调整下属性
+            // newSubItem.batchId = item.batchId
+            // newSubItem.isGift = item.isGift
+            // newSubItem.qty = subItem.qty * item.qty
+            prv.push(newSubItem);
+          });
+        } else {
+          prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
+        }
       });
-    });
-    prv.push.apply(prv, _toConsumableArray(goods));
+    } else {
+      var _next$items2;
+      // 反填组合商品
+      var goods = (next === null || next === void 0 ? void 0 : (_next$items2 = next.items) === null || _next$items2 === void 0 ? void 0 : _next$items2.map(function (item) {
+        return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
+      })) || [];
+      prv.push.apply(prv, _toConsumableArray(goods));
+    }
     return prv;
   }, []);
   return list;
@@ -226,6 +276,17 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
       case "WLN_SYSTEM_ORDER":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
         break;
+      case "WLN_REISSUE_GOODS":
+        {
+          var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
+          prv[uniqueKey] = {
+            wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
+            wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
+            wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
+            wlnReissueType: [initReason]
+          };
+        }
+        break;
       case "WLN_GOODS":
         prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
         break;
@@ -241,7 +302,7 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
 };
 //wln订单信息转换
 export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
-  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
+  var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
   console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
   var _detail$allOrders = detail.allOrders,
     allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
@@ -263,7 +324,11 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
   var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
   var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
   var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
-  console.log('**** ', {
+  var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
+    return _objectSpread({}, item);
+  });
+  var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
+  console.log("**** ", {
     isStrict: isStrict,
     onlyOneSystemOrder: onlyOneSystemOrder,
     isReissueDefaultSelect: isReissueDefaultSelect,
@@ -271,6 +336,17 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
     wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
   });
   return {
+    jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
+      orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
+      canEdit: true
+    }).filter(function (good) {
+      return !isStrict || !orderNo || good.originalDealCode === orderNo;
+    }) : [],
+    wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
+      canEdit: true
+    }).filter(function (good) {
+      return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
+    }) : [],
     wlnSystemOrder: {
       orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
       orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.7.3-beta.0",
+  "version": "2.7.3-beta.4",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c80641421cc67b5f77f17fbe4db443014610338",
+  "gitHead": "006184824679eeb9a994787da6e31518e6d6f981",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }