@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.77 → 2.2.13-beta.78

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -106,7 +106,7 @@ var FormRender = function FormRender(props, ref) {
   var userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
   var canEditShopName = useMemo(function () {
     var _userInfo$companyUser, _userInfo$companyUser2;
-    return userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$companyUser = userInfo.companyUserConfig) === null || _userInfo$companyUser === void 0 ? void 0 : (_userInfo$companyUser2 = _userInfo$companyUser.pc) === null || _userInfo$companyUser2 === void 0 ? void 0 : _userInfo$companyUser2.canEditShopName;
+    return (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$companyUser = userInfo.companyUserConfig) === null || _userInfo$companyUser === void 0 ? void 0 : (_userInfo$companyUser2 = _userInfo$companyUser.pc) === null || _userInfo$companyUser2 === void 0 ? void 0 : _userInfo$companyUser2.canEditShopName) || false;
   }, [userInfo]);
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);

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

@@ -254,6 +254,7 @@ export var orderBack = /*#__PURE__*/function () {
           // 京东自营/pdd订单数据获取
           promise.push(
           // thirdShopSubType === 1 && shopSourceStr === 'JD' && window.invokerSDK
+          // xzSDK.getActiveUserTardeInfoTest(order_no)
           ['JD', 'PDD'].includes(shopSourceStr) && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.reject());
           Object.keys(hasFlagMap).forEach(function (key) {
             var _hasFlagMap$key = hasFlagMap[key],

package/dist/esm/common/utils/xzSDK.d.ts

@@ -104,10 +104,69 @@ declare type JDTradesRes = {
     subCode: string;
     uid: string;
 };
-export declare type ActiveUserTardeInfo = JDTrade & Buyer;
+declare type PDDTrade = {
+    orderSn: string;
+    orderTime: number;
+    createdAt: number;
+    payTime: number;
+    orderStatusStr: string;
+    orderAmount: number;
+    goodsAmount: number;
+    note: string;
+    tagType: string;
+    orderGoodsList: {
+        goodsName: string;
+        goodsNumber: number;
+        goodsPrice: number;
+        skuId: string;
+        spec: string;
+        thumbUrl: string;
+    };
+};
+declare type PDDTradesRes = {
+    errorCode: number;
+    errorMsg: string | null;
+    req_id: string;
+    result: {
+        historyTotal: null;
+        historyTotalPeriodCode: number;
+        pageNo: number;
+        pageSize: number;
+        total: number;
+        orders: PDDTrade[];
+    };
+    success: boolean;
+    uid: string;
+};
+declare type TradesRes = JDTradesRes | PDDTradesRes;
+declare type Trade = JDTrade | PDDTrade;
+export declare type ActiveUserTardeInfo = Trade & Buyer;
 declare const _default: {
     getActiveUser: () => Promise<Buyer>;
     getActiveUserTardeInfo: (orderId: string) => Promise<void | {
+        orderNo: string;
+        buyerNick: string;
+        buyerOpenUid: string | number;
+        statusDesc: string;
+        orderCreateDateTime: string | number;
+        orderPaymentDateTime: string | number;
+        actualReceiptPayment: number | undefined;
+        itemList: {
+            numIid: string;
+            title: string;
+            price: number | undefined;
+            platform: string;
+            num: number;
+            skuInfoDTO: {
+                picUrl: string;
+                price: number | undefined;
+                skuId: string;
+                propertiesName: string;
+            };
+        }[];
+        remark: string;
+        flag: number | undefined;
+    } | {
         orderNo: string;
         buyerNick: string;
         buyerOpenUid: string | number;
@@ -127,8 +186,11 @@ declare const _default: {
             };
         }[];
         remark: string;
+        statusDesc?: undefined;
+        actualReceiptPayment?: undefined;
+        flag?: undefined;
     } | undefined>;
-    getTradeInfoByBuyerId: (buyerId: string | number) => Promise<JDTradesRes>;
+    getTradeInfoByBuyerId: (buyerId: string | number) => Promise<TradesRes>;
     receiveTabMsg: (dispatch: any) => void;
 };
 export default _default;

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

@@ -5,6 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { message } from 'antd';
 var globalResolveMap = new Map();
 window.replyTradeInfo = function (res) {
+  console.debug("in replyTradeInfo res:", res);
   var jsonRes = JSON.parse(res);
   if (jsonRes.reqId && globalResolveMap.has(jsonRes.reqId)) {
     var _globalResolveMap$get;
@@ -141,6 +142,11 @@ var getTradeInfoByBuyerId = function getTradeInfoByBuyerId(buyerId) {
         param: {
           reqId: reqId,
           buyerId: buyerId
+        },
+        ext: {
+          "pageNo": 1,
+          // 可选 分页从1开始
+          "pageSize": 500 // 可选
         }
       }), function (cmd, res) {
         var jsonRes = JSON.parse(res);
@@ -156,7 +162,68 @@ var getTradeInfoByBuyerId = function getTradeInfoByBuyerId(buyerId) {
   });
 };
 var transformTardeInfo = function transformTardeInfo(buyer, tradeInfo) {
+  console.debug("***** \u6570\u636E\u8F6C\u6362 *****", tradeInfo);
   if (!tradeInfo) return;
+  if ('orderSn' in tradeInfo) {
+    var _tradeInfo$tagType;
+    var trade = tradeInfo.orderGoodsList || {};
+    var flagType = ((_tradeInfo$tagType = tradeInfo.tagType) === null || _tradeInfo$tagType === void 0 ? void 0 : _tradeInfo$tagType.toLowerCase()) || '';
+    var flag = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'].findIndex(function (item) {
+      return item === flagType;
+    });
+    return {
+      // TRADE_ID_INPUT
+      orderNo: tradeInfo.orderSn,
+      // BUYER_NICK_INPUT 买家昵称
+      buyerNick: buyer.buyerNick,
+      buyerOpenUid: buyer.buyerId,
+      // ERP_ORDER_STATUS
+      statusDesc: tradeInfo.orderStatusStr,
+      // RECEIVER_NAME_INPUT 收件人姓名
+      // RECEIVER_MOBILE_INPUT 收件人手机号
+      // RECEIVER_ADDRESS_INPUT 收货地址
+      // TRADE_CREATE_DATETIME 下单时间
+      orderCreateDateTime: tradeInfo.createdAt ? tradeInfo.createdAt * 1000 : '',
+      // TRADE_PAYMENT_DATETIME 付款时间
+      orderPaymentDateTime: tradeInfo.payTime ? tradeInfo.payTime * 1000 : '',
+      // TRADE_DELIVERY_DATETIME 发货时间
+      // TRADE_CLOSING_DATETIME 成交时间
+      // ACTUAL_PAYMENT 实付金额
+      // actualPayment: tradeInfo.goodsAmount ? tradeInfo.goodsAmount / 100 : undefined, // 是否就是实付
+      // ACTUAL_RECEIPT_PAYMENT 实收金额
+      actualReceiptPayment: tradeInfo.orderAmount ? tradeInfo.orderAmount / 100 : undefined,
+      // EXPRESS_LOGISTICS_SELECT 快递物流
+      // RETURN_LOGISTICS_SELECT 退货物流
+      // ALI_PAY_INPUT 支付宝
+
+      // ITEM_SELECT/ITEM_ID/ITEM_ENCODE/ITEM_SELECT_THIRD 宝贝类组件
+      itemList: [{
+        numIid: trade.skuId,
+        title: trade.goodsName,
+        // picUrl: string,
+        price: trade.goodsPrice ? trade.goodsPrice / 100 : undefined,
+        platform: 'pdd',
+        // outerId: string;
+        num: trade.goodsNumber,
+        skuInfoDTO: {
+          picUrl: trade.thumbUrl,
+          price: typeof trade.goodsPrice === 'number' ? trade.goodsPrice / 100 : undefined,
+          skuId: trade.skuId,
+          propertiesName: trade.spec
+          // outerSkuId: number | string;
+          // itemId: string;
+          // supplierName: string;
+        }
+      }],
+
+      // REMARK_INPUT 备注
+      remark: tradeInfo.note || '',
+      flag: flag >= 0 ? flag : undefined
+      // ENTERPRISE_PAYMENT 打款组件 只反填订单号,已经有了
+      // LOGISTICS_INTERCEPTION 物流拦截
+    };
+  }
+
   return {
     // TRADE_ID_INPUT
     orderNo: tradeInfo.orderId,
@@ -213,7 +280,7 @@ var getActiveUserTardeInfo = function getActiveUserTardeInfo(orderId) {
   console.debug('orderId: ', orderId);
   return getActiveUser().then( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(buyer) {
-      var _tardes$data;
+      var _tardes$data, _tardes$result;
       var tardes, tradeInfo;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -230,8 +297,8 @@ var getActiveUserTardeInfo = function getActiveUserTardeInfo(orderId) {
             return getTradeInfoByBuyerId(buyer.buyerId);
           case 6:
             tardes = _context.sent;
-            tradeInfo = ((tardes === null || tardes === void 0 ? void 0 : (_tardes$data = tardes.data) === null || _tardes$data === void 0 ? void 0 : _tardes$data.data) || []).find(function (tarde) {
-              return orderId === tarde.orderId;
+            tradeInfo = (('data' in tardes ? tardes === null || tardes === void 0 ? void 0 : (_tardes$data = tardes.data) === null || _tardes$data === void 0 ? void 0 : _tardes$data.data : tardes === null || tardes === void 0 ? void 0 : (_tardes$result = tardes.result) === null || _tardes$result === void 0 ? void 0 : _tardes$result.orders) || []).find(function (tarde) {
+              return 'orderId' in tarde ? orderId === tarde.orderId : orderId === tarde.orderSn;
             });
             return _context.abrupt("return", transformTardeInfo(buyer, tradeInfo));
           case 9:
@@ -251,6 +318,25 @@ var getActiveUserTardeInfo = function getActiveUserTardeInfo(orderId) {
     }
   });
 };
+
+// const getActiveUserTardeInfoTest = (orderId: string) => {
+//   return new Promise((resolve, reject) => {
+//     const tardes = base64ToJson(text) as TradesRes
+//     const tradeInfo = (
+//         ('data' in tardes ? tardes?.data?.data : tardes?.result?.orders) || []
+//       ).find((tarde) => {
+//         return 'orderId' in tarde ? orderId === tarde.orderId : orderId === tarde.orderSn ;
+//       });
+//       resolve(transformTardeInfo({
+//         buyerId: "3633810253",
+//         buyerNick: "e***",
+//         clientType: 3,
+//         qnCCode: "",
+//         qnPrefix: ""
+//       }, tradeInfo))
+//   })
+// }
+
 var sendMsgToTab = function sendMsgToTab(dispatch) {
   return function (msg) {
     try {
@@ -298,5 +384,6 @@ export default {
   getActiveUser: getActiveUser,
   getActiveUserTardeInfo: getActiveUserTardeInfo,
   getTradeInfoByBuyerId: getTradeInfoByBuyerId,
+  // getActiveUserTardeInfoTest,
   receiveTabMsg: receiveTabMsg
 };

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/paymentWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/singleShopWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13-beta.77",
+  "version": "2.2.13-beta.78",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cd7fe95d1b7d8f25f68ca76f2a2c753332dae2bd",
+  "gitHead": "e4ecc088240fa232e02dbe30cf8f0ed50ae37578",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }