kmkf-work-order-service-component 0.5.1-alpha.2 → 0.5.1

package/dist/esm/FormRender/index.js

@@ -257,7 +257,7 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-              _context.next = 37;
+              _context.next = 38;
               break;
 
             case 24:
@@ -278,11 +278,14 @@ var FormRender = function FormRender(props, ref) {
                 accessToken: get(find(shopList, function (s) {
                   return s.shopId === shopId;
                 }), 'accessToken', ''),
-                buyerOpenUid: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid) || buyerId,
-                buyerNick: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerNick) || buyerNick,
                 source: get(platformMap, "".concat(platform), '工单通')
               };
-              _params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params);
+              _params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params); //飞鸽端外部传递买家id
+
+              if (platform === 'fxg') {
+                _params.buyerOpenUid = buyerId;
+              }
+
               hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
                 return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
               });
@@ -308,10 +311,10 @@ var FormRender = function FormRender(props, ref) {
 
               console.debug('增加数据参数', _params); // return;
 
-              _context.next = 33;
+              _context.next = 34;
               return addWorkOrder(_params);
 
-            case 33:
+            case 34:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -324,13 +327,13 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-            case 37:
+            case 38:
               console.groupEnd();
-              _context.next = 43;
+              _context.next = 44;
               break;
 
-            case 40:
-              _context.prev = 40;
+            case 41:
+              _context.prev = 41;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -346,12 +349,12 @@ var FormRender = function FormRender(props, ref) {
                 }, 0);
               }
 
-            case 43:
+            case 44:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 40]]);
+      }, _callee, null, [[0, 41]]);
     }));
 
     return function asyncDoSave(_x, _x2) {

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

@@ -34,7 +34,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, jstOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
 import express from "./express";
 import cache from "../cache";
@@ -796,7 +796,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, _jstOrder$value, _jstOrder$value$data, taobaoId, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, jstOrder, orderInfo, buyerInfo, jstInfo, formValue, detail, values, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -820,13 +820,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订单接口
+            })];
+            taobaoId ? promise.push(getThirdOpenUidByOrderNo({
+              orderNo: order_no,
+              toAppKey: '21819818',
+              platform: 'tb',
+              taobaoId: taobaoId
+            })) : promise.push(new Promise(function (resolve) {
+              resolve({});
+            })); //判断是否有聚水潭组件 有就请求jst订单接口
 
             hasJst = HasJstHandle(templateDetail);
 
@@ -836,19 +847,21 @@ export var orderBack = /*#__PURE__*/function () {
               }));
             }
 
-            _context.next = 11;
+            _context.next = 13;
             return Promise.allSettled(promise);
 
-          case 11:
+          case 13:
             _yield$Promise$allSet = _context.sent;
-            _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
+            _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 3);
             data = _yield$Promise$allSet2[0];
-            jstOrder = _yield$Promise$allSet2[1];
+            buyer = _yield$Promise$allSet2[1];
+            jstOrder = _yield$Promise$allSet2[2];
             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) || {};
             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) || []; //获取当前表单字段
 
             formValue = form.getFieldsValue();
-            detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
+            detail = _objectSpread(_objectSpread(_objectSpread({}, orderInfo), buyerInfo), {}, {
               jstItemList: jstInfo
             }); //抖音数据特殊处理
 
@@ -990,19 +1003,19 @@ export var orderBack = /*#__PURE__*/function () {
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
             callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-            _context.next = 28;
+            _context.next = 32;
             break;
 
-          case 26:
-            _context.prev = 26;
+          case 30:
+            _context.prev = 30;
             _context.t0 = _context["catch"](5);
 
-          case 28:
+          case 32:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 26]]);
+    }, _callee, null, [[5, 30]]);
   }));
 
   return function orderBack(_x) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.5.1-alpha.2",
+  "version": "0.5.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.11",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",