kmkf-work-order-service-component 0.4.10-alpha.7 → 0.5.0-alpha.1

package/dist/esm/common/utils/tools.js

@@ -1,11 +1,3 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -34,7 +26,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 import { get, isEmpty, find, keys, every } from 'lodash';
 import V from 'voca';
-import { orderDetail, jstOrderDetail } from "../../model/servers/api";
+import { orderDetail, getThirdOpenUidByOrderNo } from "../../model/servers/api";
 import moment from 'moment';
 import express from "./express";
 import cache from "../cache";
@@ -442,110 +434,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }).join(),
         name: item.name
       });
-    } else if (item.workOrderComponentType === 'JST_LOGISTICS') {
-      var logisticsList = get(nowData, "".concat(item.uniqueKey), []); //判断单个组件是否有输入值 没有就传空
-      // if (
-      //   logisticsList.length === 1 &&
-      //   !logisticsList[0]?.items?.length &&
-      //   logisticsList.some((t) => {
-      //     return !t.logisticsCompany && !t.logisticsCode;
-      //   })
-      // ) {
-      //   logisticsList = [];
-      // }
-
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
-        content: JSON.stringify(logisticsList),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_logisticsCompany"),
-        content: logisticsList.map(function (item) {
-          return item.logisticsCompany;
-        }).join(),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_logisticsCode"),
-        content: logisticsList.map(function (item) {
-          return item.logisticsCode;
-        }).join(),
-        name: item.name
-      });
-    } else if (item.workOrderComponentType === 'JST_SUPPLY') {
-      var supplyList = get(nowData, "".concat(item.uniqueKey), []); // if (
-      //   supplyList.length === 1 &&
-      //   !supplyList[0]?.items?.length &&
-      //   supplyList.some((t) => {
-      //     return !t.supplyId;
-      //   })
-      // ) {
-      //   supplyList = [];
-      // }
-
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
-        content: JSON.stringify(supplyList),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_supplyId"),
-        content: supplyList.map(function (item) {
-          return item.supplyId;
-        }).join(),
-        name: item.name
-      });
-    } else if (item.workOrderComponentType === 'JST_SEND_GOOD') {
-      var sendList = get(nowData, "".concat(item.uniqueKey), []); // if (
-      //   sendList.length === 1 &&
-      //   !sendList[0]?.items?.length &&
-      //   sendList.some((t) => {
-      //     return !t.sendId && !t.sendName;
-      //   })
-      // ) {
-      //   sendList = [];
-      // }
-
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
-        content: JSON.stringify(sendList),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_sendId"),
-        content: sendList.map(function (item) {
-          return item.sendId;
-        }).join(),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_sendName"),
-        content: sendList.map(function (item) {
-          return item.sendName;
-        }).join(),
-        name: item.name
-      });
-    } else if (item.workOrderComponentType === 'JST_ITEM_SELECT_THIRD') {
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
-        content: JSON.stringify(get(nowData, "".concat(item.uniqueKey), [])),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_itemId"),
-        content: get(nowData, "".concat(item.uniqueKey), []).map(function (item) {
-          return item.itemId;
-        }).join(),
-        name: item.name
-      });
-      contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_supplierName"),
-        content: get(nowData, "".concat(item.uniqueKey), []).map(function (item) {
-          return item.supplierName;
-        }).join(),
-        name: item.name
-      });
     } else {
       var _nowData$item$uniqueK;
 
@@ -754,30 +642,6 @@ var transDataSource = function transDataSource(templateColumns) {
         }));
       } else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
-      } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
-        var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
-          logisticsCompany: null,
-          logisticsCode: null
-        }]);
-
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList2));
-      } else if (nex.workOrderComponentType === 'JST_ITEM_SELECT_THIRD') {
-        var _itemList3 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], []);
-
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList3));
-      } else if (nex.workOrderComponentType === 'JST_SUPPLY') {
-        var _itemList4 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
-          supplyId: null
-        }]);
-
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList4));
-      } else if (nex.workOrderComponentType === 'JST_SEND_GOOD') {
-        var _itemList5 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
-          sendName: '',
-          sendId: ''
-        }]);
-
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList5));
       }
 
       return cur;
@@ -792,7 +656,8 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
     return _objectSpread(_objectSpread(_objectSpread({}, item.jsonMap), value), {}, {
       shopId: item.shopId,
       shopName: item.shopName,
-      id: item.id
+      id: item.id,
+      repeatValueList: item.repeatValueList
     });
   });
   return finalSource;
@@ -802,7 +667,7 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _data$value, _jstOrder$value, _jstOrder$value$data, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, orderInfo, jstInfo, formValue, detail, values, _templateDetail$compo, paymentUniqueKey;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -826,22 +691,24 @@ export var orderBack = /*#__PURE__*/function () {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
             _context.prev = 5;
+            taobaoId = (_shopList$find2 = shopList.find(function (item) {
+              return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
+            })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
             promise = [orderDetail({
               shopId: shopId,
               //店铺id
               orderNo: order_no,
               //订单id
               templateId: templateDetail.uniqueKey
-            })]; //判断是否有聚水潭组件 有就请求jst订单接口
-
-            hasJst = HasJstHandle(templateDetail);
-
-            if (hasJst) {
-              promise.push(jstOrderDetail({
-                soId: order_no
-              }));
-            }
-
+            })];
+            taobaoId ? promise.push(getThirdOpenUidByOrderNo({
+              orderNo: order_no,
+              toAppKey: '21819818',
+              platform: 'tb',
+              taobaoId: taobaoId
+            })) : promise.push(new Promise(function (resolve) {
+              resolve({});
+            }));
             _context.next = 11;
             return Promise.allSettled(promise);
 
@@ -849,138 +716,115 @@ export var orderBack = /*#__PURE__*/function () {
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
-            jstOrder = _yield$Promise$allSet2[1];
-            orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
-            jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || []; //获取当前表单字段
+            buyer = _yield$Promise$allSet2[1];
+            // console.log(data, buyer);
+            orderInfo = data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data;
+            buyerInfo = buyer === null || buyer === void 0 ? void 0 : (_buyer$value = buyer.value) === null || _buyer$value === void 0 ? void 0 : _buyer$value.data;
+            _ref3 = orderInfo || {}, orderNo = _ref3.orderNo, provinceCode = _ref3.provinceCode, cityCode = _ref3.cityCode, townCode = _ref3.townCode, orderCreateDateTime = _ref3.orderCreateDateTime, orderPaymentDateTime = _ref3.orderPaymentDateTime, orderDeliveryDateTime = _ref3.orderDeliveryDateTime, orderClosingDateTime = _ref3.orderClosingDateTime, itemList = _ref3.itemList;
+            transField = orderInfo ? {
+              tradeId: orderNo,
+              province: provinceCode,
+              city: cityCode,
+              district: townCode,
+              tradeCreateDateTime: orderCreateDateTime,
+              tradePaymentDateTime: orderPaymentDateTime,
+              tradeDeliveryDateTime: orderDeliveryDateTime,
+              tradeClosingDateTime: orderClosingDateTime,
+              goodId: itemList,
+              goodSerial: itemList
+            } : {};
+            finalResponse = {};
+
+            if (orderInfo) {
+              finalResponse = _objectSpread(_objectSpread({}, orderInfo || {}), transField);
+            }
+
+            if (buyerInfo) {
+              finalResponse = _objectSpread(_objectSpread({}, finalResponse), {}, {
+                buyer: buyerInfo || {},
+                payBuyer: buyerInfo || {}
+              });
+            } //获取当前表单字段
+
 
             formValue = form.getFieldsValue();
-            detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
-              jstItemList: jstInfo
-            });
-            console.log(detail); //抖音数据特殊处理
+            detail = finalResponse || {}; //抖音数据
 
             if (shopSourceStr === 'FXG') {
-              detail = updateDYDetails(detail);
-            } //整合返回值
-
-
-            values = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
-              var uniqueKey = next.uniqueKey;
-              var config = next.componentConfig;
-
-              switch (next.workOrderComponentType) {
-                case 'TRADE_ID_INPUT':
-                  prv[uniqueKey] = order_no || detail['orderNo'];
-                  break;
-
-                case 'BUYER_NICK_INPUT':
-                  prv[uniqueKey] = {
-                    buyerNick: detail['buyerNick'],
-                    buyerOpenUid: detail['buyerOpenUid']
-                  };
-                  break;
-
-                case 'RECEIVER_NAME_INPUT':
-                  prv[uniqueKey] = detail['receiveName'];
-                  break;
-
-                case 'RECEIVER_MOBILE_INPUT':
-                  prv[uniqueKey] = detail['receiveMobile'];
-                  break;
-
-                case 'RECEIVER_ADDRESS_INPUT':
-                  prv[uniqueKey] = {
-                    address: [+detail['provinceCode'], +detail['cityCode'], +detail['townCode']],
-                    detail: detail['address'] || ''
-                  };
-                  break;
-
-                case 'TRADE_CREATE_DATETIME':
-                  prv[uniqueKey] = detail['orderCreateDateTime'] ? moment(detail['orderCreateDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
-                  break;
-
-                case 'TRADE_PAYMENT_DATETIME':
-                  prv[uniqueKey] = detail['orderPaymentDateTime'] ? moment(detail['orderPaymentDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
-                  break;
-
-                case 'TRADE_DELIVERY_DATETIME':
-                  prv[uniqueKey] = detail['orderDeliveryDateTime'] ? moment(detail['orderDeliveryDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
-                  break;
-
-                case 'TRADE_CLOSING_DATETIME':
-                  prv[uniqueKey] = detail['orderClosingDateTime'] ? moment(detail['orderClosingDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
-                  break;
-
-                case 'ACTUAL_PAYMENT':
-                  prv[uniqueKey] = detail['actualPayment'];
-                  break;
-
-                case 'EXPRESS_LOGISTICS_SELECT':
-                  prv[uniqueKey] = {
-                    company: detail['expressLogisticsCompany'],
-                    order: detail['expressLogisticsCode']
-                  };
-                  break;
-
-                case 'RETURN_LOGISTICS_SELECT':
-                  prv[uniqueKey] = {
-                    company: detail['returnLogisticsCompany'],
-                    order: detail['returnLogisticsCode']
-                  };
-                  break;
-
-                case 'ALI_PAY_INPUT':
-                  prv[uniqueKey] = {
-                    name: detail['alipayName'],
-                    user: detail['alipayAccount']
-                  };
-                  break;
-
-                case 'ITEM_SELECT':
-                case 'ITEM_ID':
-                case 'ITEM_ENCODE':
-                  prv[uniqueKey] = taobaoGoodHandle(detail['itemList'], next.workOrderComponentType, next.componentConfig);
-                  break;
-
-                case 'REMARK_INPUT':
-                  prv[uniqueKey] = {
-                    remark: detail['remark'] || '',
-                    flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
-                  };
-                  break;
-
-                case 'ENTERPRISE_PAYMENT':
-                  //编辑的时候不能修改打款信息
-                  if (type === 'edit') break;
-                  prv[uniqueKey] = {
-                    enterprisePaymentTid: '',
-                    enterprisePaymentRefundFee: '',
-                    enterprisePaymentBuyerNick: detail['buyerNick'],
-                    enterprisePaymentBuyerOpenUid: detail['buyerOpenUid'],
-                    enterprisePaymentAlipayNick: '',
-                    enterprisePaymentAlipayNo: ''
-                  };
-                  break;
-
-                case 'JST_ITEM_SELECT_THIRD':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList', config);
-                  break;
-
-                case 'JST_SUPPLY':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply', config);
-                  break;
-
-                case 'JST_SEND_GOOD':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send', config);
-                  break;
-
-                case 'JST_LOGISTICS':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics', config);
-                  break;
+              detail = updateDYDetails(finalResponse);
+            }
+
+            componentsParams = getComponentsValue((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []); //获取详情映射表单字段
+
+            detailsValue = Object.keys(componentsParams).reduce(function (prv, next) {
+              var _detail$buyer, _detail$buyer2;
+
+              var key = componentsParams[next].key;
+              var uniqueKey = componentsParams[next].uniqueKey;
+
+              if (detail[next]) {
+                switch (next) {
+                  case 'province':
+                    prv[uniqueKey] = {
+                      address: [+detail['province'], +detail['city'], +detail['district']],
+                      detail: detail['address'] || ''
+                    };
+                    break;
+
+                  case 'expressLogisticsCompany':
+                    prv[uniqueKey] = {
+                      company: detail['expressLogisticsCompany'],
+                      order: detail['expressLogisticsCode']
+                    };
+                    break;
+
+                  case 'alipayName':
+                    prv[uniqueKey] = {
+                      name: detail['alipayName'],
+                      user: detail['alipayAccount']
+                    };
+                    break;
+
+                  case 'tradePaymentDateTime':
+                  case 'tradeCreateDateTime':
+                  case 'tradeClosingDateTime':
+                  case 'tradeDeliveryDateTime':
+                    prv[uniqueKey] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
+                    break;
+
+                  case 'remark':
+                    prv[uniqueKey] = {
+                      remark: detail['remark'] || '',
+                      flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
+                    };
+                    break;
+
+                  case 'goodId':
+                  case 'goodSerial':
+                  case 'itemList':
+                    prv[uniqueKey] = detail['itemList'];
+                    break;
+
+                  case 'payBuyer':
+                    if (type === 'edit') break;
+                    prv[uniqueKey] = {
+                      enterprisePaymentTid: '',
+                      enterprisePaymentRefundFee: '',
+                      enterprisePaymentBuyerNick: (_detail$buyer = detail['buyer']) === null || _detail$buyer === void 0 ? void 0 : _detail$buyer.buyerNick,
+                      enterprisePaymentBuyerOpenUid: (_detail$buyer2 = detail['buyer']) === null || _detail$buyer2 === void 0 ? void 0 : _detail$buyer2.buyerOpenUid,
+                      enterprisePaymentAlipayNick: '',
+                      enterprisePaymentAlipayNo: ''
+                    };
+                    break;
+
+                  default:
+                    prv["".concat(uniqueKey)] = detail[key];
+                    break;
+                }
               }
 
               return prv;
-            }, {}); //新建的情况下订单返填不能清空打款信息
+            }, {}); //打款组件
 
             if (type !== 'edit') {
               paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
@@ -988,28 +832,29 @@ export var orderBack = /*#__PURE__*/function () {
               })) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
 
               if (paymentUniqueKey && orderInfo) {
-                values[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), values[paymentUniqueKey]), {}, {
+                detailsValue[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), detailsValue[paymentUniqueKey]), {}, {
                   enterprisePaymentTid: order_no
                 });
               }
             }
 
-            console.log(values);
-            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
-            callback === null || callback === void 0 ? void 0 : callback(detail);
-            _context.next = 30;
+            console.debug('detailsValue', detailsValue); // console.log('detailsValue++', formValue, detailsValue);
+
+            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
+            callback === null || callback === void 0 ? void 0 : callback(finalResponse);
+            _context.next = 35;
             break;
 
-          case 28:
-            _context.prev = 28;
+          case 33:
+            _context.prev = 33;
             _context.t0 = _context["catch"](5);
 
-          case 30:
+          case 35:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 28]]);
+    }, _callee, null, [[5, 33]]);
   }));
 
   return function orderBack(_x) {
@@ -1018,23 +863,33 @@ export var orderBack = /*#__PURE__*/function () {
 }(); //抖音平台数据处理
 
 var updateDYDetails = function updateDYDetails(value) {
-  var details = _objectSpread({}, value); //处理地址
+  var details = _objectSpread({}, value);
 
+  var address = ['province', 'city', 'district']; //处理地址
 
-  if (details['provinceCode']) {
+  if (details['province']) {
+    // let cityData: string[] = [],
+    // areaData: string[] = [];
     //直辖市区特殊处理
     var addList = ['110000', '120000', '310000', '500000'];
 
-    if (addList.includes(details.provinceCode)) {
-      var cityCode = details['cityCode'];
-      var newCity = cityCode.split('');
+    if (addList.includes(details.province)) {
+      var city = details['city'];
+      var newCity = city.split('');
       newCity[3] = '1';
-      details['cityCode'] = newCity.join('');
-    }
+      details['city'] = newCity.join('');
+    } // address.forEach(item => {
+    //   if (item === 'city') {
+    //     cityData = details['province'] ? formatAddrData.getCityByProCode(details['province']) : []
+    //   } else if (item === 'district') {
+    //     areaData = details['city'] ? formatAddrData.getAreaByCityCode(details['city']) : []
+    //   }
+    // })
+
   } //处理时间
 
 
-  var times = ['orderClosingDateTime', 'orderCreateDateTime', 'orderDeliveryDateTime', 'orderPaymentDateTime'];
+  var times = ['tradeClosingDateTime', 'tradeCreateDateTime', 'tradeDeliveryDateTime', 'tradePaymentDateTime'];
   times.forEach(function (item) {
     if (details[item]) {
       details[item] = moment(details[item]).format('YYYY-MM-DD HH:mm:ss');
@@ -1052,6 +907,42 @@ var updateDYDetails = function updateDYDetails(value) {
     }
   });
   return details;
+}; //获取模版组件
+
+
+var getComponentsValue = function getComponentsValue() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  //订单详情映射字段
+  var mapList = {
+    TRADE_ID_INPUT: 'tradeId',
+    RECEIVER_NAME_INPUT: 'receiveName',
+    RECEIVER_MOBILE_INPUT: 'receiveMobile',
+    RECEIVER_ADDRESS_INPUT: 'province',
+    TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+    TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+    TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+    TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
+    ACTUAL_PAYMENT: 'actualPayment',
+    EXPRESS_LOGISTICS_SELECT: 'expressLogisticsCompany',
+    RETURN_LOGISTICS_SELECT: 'returnLogisticsCompany',
+    ALI_PAY_INPUT: 'alipayName',
+    ITEM_SELECT: 'itemList',
+    REMARK_INPUT: 'remark',
+    ITEM_ID: 'goodId',
+    ITEM_ENCODE: 'goodSerial',
+    BUYER_NICK_INPUT: 'buyer',
+    ENTERPRISE_PAYMENT: 'payBuyer'
+  };
+  return list.reduce(function (prv, next) {
+    if (mapList[next.workOrderComponentType]) {
+      prv[mapList[next.workOrderComponentType]] = {
+        uniqueKey: next.uniqueKey,
+        key: mapList[next.workOrderComponentType]
+      };
+    }
+
+    return prv;
+  }, {});
 }; //图片压缩
 
 
@@ -1100,143 +991,4 @@ export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail,
     });
     return prv;
   }, []);
-}; //淘宝商品组件信息处理
-
-export var taobaoGoodHandle = function taobaoGoodHandle(arr, type, config) {
-  var list = JSON.parse(JSON.stringify(arr));
-  var changeSku = config.changeSku;
-  return list.map(function (item) {
-    var numIid = item.numIid,
-        title = item.title,
-        picUrl = item.picUrl,
-        price = item.price,
-        outerId = item.outerId,
-        skuId = item.skuId,
-        platform = item.platform,
-        skuInfoDTO = item.skuInfoDTO;
-    var params = {
-      numIid: numIid,
-      title: title,
-      picUrl: picUrl,
-      price: price,
-      platform: platform
-    };
-
-    if (skuInfoDTO) {
-      params.picUrl = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.picUrl;
-      params.price = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.price;
-      params.skuId = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.skuId;
-    }
-
-    if (changeSku) {
-      params.propertiesName = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.propertiesName) || '';
-    }
-
-    if (type === 'ITEM_ENCODE') {
-      params.outerId = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.outerSkuId) || outerId;
-    } else if (type === 'ITEM_SELECT_THIRD') {
-      params.itemId = '';
-      params.supplierName = '';
-    }
-
-    return params;
-  });
-}; //聚水潭订单返填
-
-export var HasJstHandle = function HasJstHandle(templateDetail) {
-  return templateDetail.componentDtoList.some(function (item) {
-    return ['JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
-  });
-}; //重组聚水潭商品数据
-
-export var updateJSTItemListHandle = function updateJSTItemListHandle() {
-  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'logistics';
-  var config = arguments.length > 2 ? arguments[2] : undefined;
-  var newList = JSON.parse(JSON.stringify(list));
-  var showField = config.showField,
-      enableItemId = config.enableItemId,
-      enableSupplierName = config.enableSupplierName;
-
-  if (type !== 'itemList') {
-    var _list = newList.map(function (item) {
-      var items = item.items.map(function (t) {
-        return {
-          title: t.skuName,
-          picUrl: t.pic,
-          platform: 'jst',
-          skuId: t.skuId
-        };
-      });
-      var params = {
-        items: items
-      };
-
-      if (type === 'logistics') {
-        params.logisticsCompany = express.getExpressNameByName(item.logisticsCompany);
-        params.logisticsCode = item.lId;
-      } else if (type === 'supply') {
-        params.supplyId = item.drpCoIdTo;
-      } else if (type === 'send') {
-        if (['sendId', 'all'].includes(showField)) {
-          params.sendId = item.wmsCoId;
-        }
-
-        if (['sendName', 'all'].includes(showField)) {
-          params.sendName = item.wmsCoName;
-        }
-      }
-
-      console.log(params);
-      return params;
-    });
-
-    if (!_list.length) {
-      switch (type) {
-        case 'logistics':
-          _list = [{
-            logisticsCompany: null,
-            logisticsCode: ''
-          }];
-          break;
-
-        case 'supply':
-          _list = [{
-            supplyId: ''
-          }];
-          break;
-
-        case 'send':
-          _list = [{
-            sendId: '',
-            sendName: ''
-          }];
-          break;
-      }
-    }
-
-    return _list;
-  } else {
-    return newList.reduce(function (prv, next) {
-      var items = next.items.map(function (t) {
-        var params = {
-          title: t.skuName,
-          picUrl: t.pic,
-          platform: 'jst'
-        };
-
-        if (enableItemId) {
-          params.itemId = t.supplierId;
-        }
-
-        if (enableSupplierName) {
-          params.supplierName = t.supplierName;
-        }
-
-        return params;
-      });
-      prv.push.apply(prv, _toConsumableArray(items));
-      return prv;
-    }, []);
-  }
 };