@kmkf-fe-packages/kmkf-work-order-service-component 2.0.54-beta.87 → 2.0.54-beta.89

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/esm/common/utils/tools.js +64 -57
  2. package/package.json +5 -5
package/dist/esm/common/utils/tools.js CHANGED
@@ -137,7 +137,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
137
137
  //订单返填
138
138
  export var orderBack = /*#__PURE__*/function () {
139
139
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
140
- var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
140
+ var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
141
141
  return _regeneratorRuntime().wrap(function _callee$(_context) {
142
142
  while (1) switch (_context.prev = _context.next) {
143
143
  case 0:
@@ -290,56 +290,58 @@ export var orderBack = /*#__PURE__*/function () {
290
290
  if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
291
291
  message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
292
292
  }
293
- orderInfo = getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
294
- if ([PlatForm.TB].includes(plat.platform)) {
293
+ orderInfo = ((data === null || data === void 0 ? void 0 : (_data$value3 = data.value) === null || _data$value3 === void 0 ? void 0 : _data$value3.data) || (xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value)) && getBasicsOrderInfo(data === null || data === void 0 ? void 0 : (_data$value4 = data.value) === null || _data$value4 === void 0 ? void 0 : _data$value4.data, xiaozhiOrder === null || xiaozhiOrder === void 0 ? void 0 : xiaozhiOrder.value); //千牛端优先获取端上买家昵称
294
+ if ([PlatForm.TB].includes(plat.platform) && orderInfo) {
295
295
  orderInfo.buyerNick = (plat === null || plat === void 0 ? void 0 : plat.buyerNick) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick);
296
296
  }
297
- jstOrders = jstOrder !== null && jstOrder !== void 0 && (_jstOrder$value = jstOrder.value) !== null && _jstOrder$value !== void 0 && _jstOrder$value.data ? {
297
+ jstOrders = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : _jstOrder$value.data) && {
298
298
  orderList: jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value2 = jstOrder.value) === null || _jstOrder$value2 === void 0 ? void 0 : _jstOrder$value2.data
299
- } : {};
300
- bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
301
- wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
302
- wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
303
- bsE3Orders = (bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data) || {};
304
- kmOrders = (kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data) || {};
305
- gyOrders = (gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data) || [];
306
- bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
307
- wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
308
- kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
309
- gyOrders.trades = filterGyOrders(gyOrders, order_no);
310
- jstOrders.trades = filterJstOrders(jstOrders, order_no);
299
+ } || null;
300
+ bsOrders = bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data;
301
+ wlnOrders = wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data;
302
+ wdtOrders = wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data;
303
+ bsE3Orders = bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data;
304
+ kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
305
+ gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
306
+ if (bsE3Orders) bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
307
+ if (wdtOrders) wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
308
+ if (kmOrders) kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
309
+ if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
310
+ if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
311
311
  pushGyLog('gyOrders', gyOrders);
312
312
  Monitor.automaticReport({
313
- message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders), ", km\u4FE1\u606F:").concat(JSON.stringify(kmOrders), ",\u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders))
313
+ message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n \u5E97\u94FAid:").concat(shopId, ",\n \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n ")
314
314
  });
315
- if (plat !== null && plat !== void 0 && plat.subOrderNo) {
315
+ if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
316
316
  bsOrders.orders = bsOrders.orders.filter(function (item) {
317
317
  return item.billNo === plat.subOrderNo;
318
318
  });
319
319
  }
320
- bsInfo = bsOrderTransform({
320
+ bsInfo = bsOrders && bsOrderTransform({
321
321
  detail: bsOrders || {}
322
322
  });
323
- wlnInfo = wlnOrderTransform(wlnOrders || {});
324
- bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
323
+ wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
324
+ bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
325
325
  componentList: templateDetail.componentDtoList,
326
326
  orderNo: order_no
327
327
  }), form);
328
- wdtInfo = wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
328
+ wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
329
329
  componentList: templateDetail.componentDtoList,
330
330
  orderNo: order_no
331
331
  }), form);
332
- kmInfo = kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
332
+ kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
333
333
  order_no: order_no,
334
334
  componentList: templateDetail.componentDtoList
335
335
  }), form);
336
- kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
337
- gyInfo = gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
336
+ if (kmInfo) {
337
+ kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
338
+ }
339
+ gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
338
340
  componentList: templateDetail.componentDtoList,
339
341
  orderNo: order_no
340
342
  }), form);
341
343
  pushGyLog('gyInfo', gyInfo);
342
- jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
344
+ jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
343
345
  componentList: templateDetail.componentDtoList,
344
346
  orderNo: order_no
345
347
  }), form);
@@ -443,7 +445,7 @@ export var orderBack = /*#__PURE__*/function () {
443
445
 
444
446
  //获取当前表单字段
445
447
  formValue = form.getFieldsValue();
446
- detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
448
+ detail = _objectSpread(_objectSpread({}, orderInfo || {}), {}, {
447
449
  jstOrder: jstInfo,
448
450
  bsOrder: bsInfo,
449
451
  wlnOrder: wlnInfo,
@@ -454,6 +456,10 @@ export var orderBack = /*#__PURE__*/function () {
454
456
  });
455
457
  pushGyLog('detail', detail);
456
458
  //抖音数据特殊处理
459
+ if (!orderInfo) {
460
+ _context.next = 118;
461
+ break;
462
+ }
457
463
  if (shopSourceStr === 'FXG') {
458
464
  detail = updateDYDetails(detail);
459
465
  } else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
@@ -463,7 +469,7 @@ export var orderBack = /*#__PURE__*/function () {
463
469
  hasSelectItem = HasErpItemSelectHandle(templateDetail);
464
470
  erpPromiseList = [];
465
471
  if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
466
- _context.next = 101;
472
+ _context.next = 102;
467
473
  break;
468
474
  }
469
475
  list = detail['itemList'];
@@ -481,10 +487,10 @@ export var orderBack = /*#__PURE__*/function () {
481
487
  resolve({});
482
488
  });
483
489
  });
484
- _context.prev = 91;
485
- _context.next = 94;
490
+ _context.prev = 92;
491
+ _context.next = 95;
486
492
  return Promise.all(promises);
487
- case 94:
493
+ case 95:
488
494
  erpPromiseList = _context.sent;
489
495
  detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
490
496
  return _objectSpread(_objectSpread({}, item), {}, {
@@ -494,25 +500,25 @@ export var orderBack = /*#__PURE__*/function () {
494
500
  })
495
501
  });
496
502
  });
497
- _context.next = 101;
503
+ _context.next = 102;
498
504
  break;
499
- case 98:
500
- _context.prev = 98;
501
- _context.t1 = _context["catch"](91);
505
+ case 99:
506
+ _context.prev = 99;
507
+ _context.t1 = _context["catch"](92);
502
508
  console.error('调用erp获取宝贝编码错误', _context.t1);
503
- case 101:
509
+ case 102:
504
510
  // 判断是否存在签收时间组件
505
511
  hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
506
512
  if (!hasSigningDatetime) {
507
- _context.next = 117;
513
+ _context.next = 118;
508
514
  break;
509
515
  }
510
516
  if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
511
- _context.next = 116;
517
+ _context.next = 117;
512
518
  break;
513
519
  }
514
- _context.prev = 104;
515
- _context.next = 107;
520
+ _context.prev = 105;
521
+ _context.next = 108;
516
522
  return request({
517
523
  url: '/qy/logistics/logisticsSignTime',
518
524
  method: 'post',
@@ -522,23 +528,24 @@ export var orderBack = /*#__PURE__*/function () {
522
528
  mailNo: orderInfo.expressLogisticsCode
523
529
  }
524
530
  });
525
- case 107:
531
+ case 108:
526
532
  signDatetime = _context.sent;
527
533
  detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
528
- _context.next = 114;
534
+ _context.next = 115;
529
535
  break;
530
- case 111:
531
- _context.prev = 111;
532
- _context.t2 = _context["catch"](104);
536
+ case 112:
537
+ _context.prev = 112;
538
+ _context.t2 = _context["catch"](105);
533
539
  console.error('调用签收时间错误', _context.t2);
534
- case 114:
535
- _context.next = 117;
540
+ case 115:
541
+ _context.next = 118;
536
542
  break;
537
- case 116:
538
- detail['tradeSigningDateTime'] = '';
539
543
  case 117:
544
+ detail['tradeSigningDateTime'] = '';
545
+ case 118:
540
546
  values = orderBackFormValues({
541
547
  detail: detail,
548
+ _get_order_fail_: !orderInfo,
542
549
  order_no: order_no,
543
550
  formValue: formValue,
544
551
  templateDetail: templateDetail,
@@ -580,21 +587,21 @@ export var orderBack = /*#__PURE__*/function () {
580
587
  shopId: shopId
581
588
  }));
582
589
  callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
583
- _context.next = 128;
590
+ _context.next = 129;
584
591
  break;
585
- case 125:
586
- _context.prev = 125;
592
+ case 126:
593
+ _context.prev = 126;
587
594
  _context.t3 = _context["catch"](25);
588
595
  console.error(_context.t3);
589
- case 128:
590
- _context.prev = 128;
596
+ case 129:
597
+ _context.prev = 129;
591
598
  setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
592
- return _context.finish(128);
593
- case 131:
599
+ return _context.finish(129);
600
+ case 132:
594
601
  case "end":
595
602
  return _context.stop();
596
603
  }
597
- }, _callee, null, [[5, 12, 15, 18], [25, 125, 128, 131], [91, 98], [104, 111]]);
604
+ }, _callee, null, [[5, 12, 15, 18], [25, 126, 129, 132], [92, 99], [105, 112]]);
598
605
  }));
599
606
  return function orderBack(_x) {
600
607
  return _ref2.apply(this, arguments);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.0.54-beta.87",
3
+ "version": "2.0.54-beta.89",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.0.54-beta.86",
36
- "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.86",
37
- "@kmkf-fe-packages/services-components": "2.0.54-beta.86",
35
+ "@kmkf-fe-packages/basic-components": "2.0.54-beta.89",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.89",
37
+ "@kmkf-fe-packages/services-components": "2.0.54-beta.89",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "347083156cf2d6e15c461d50fac2a62ad79fa8b0",
76
+ "gitHead": "054496f0ae6357b525e75f1b5d25f018e46be2de",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }