@kmkf-fe-packages/kmkf-utils 2.2.44-beta.0 → 2.2.44-beta.101

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 (41) hide show
  1. package/README.md +1 -1
  2. package/dist/esm/baseAddressData/constants/jkyAddressData.d.ts +12 -0
  3. package/dist/esm/baseAddressData/constants/jkyAddressData.js +83 -0
  4. package/dist/esm/baseAddressData/index.d.ts +1 -0
  5. package/dist/esm/baseAddressData/index.js +2 -1
  6. package/dist/esm/constants/constant.d.ts +3 -0
  7. package/dist/esm/constants/constant.js +3 -0
  8. package/dist/esm/constants/msgTypeMapping.js +2 -1
  9. package/dist/esm/servers/JKY/logisticsData.js +33 -37
  10. package/dist/esm/servers/JKY/warehouseData.d.ts +1 -0
  11. package/dist/esm/servers/JKY/warehouseData.js +6 -4
  12. package/dist/esm/servers/JST/orderDetailWrap.js +1 -1
  13. package/dist/esm/servers/JY/logisticsData.js +2 -2
  14. package/dist/esm/servers/index.d.ts +2 -1
  15. package/dist/esm/servers/index.js +17 -1
  16. package/dist/esm/utils/SendData.d.ts +2 -0
  17. package/dist/esm/utils/SendData.js +7 -1
  18. package/dist/esm/utils/bsE3OrderBackFormValues.d.ts +1 -0
  19. package/dist/esm/utils/bsE3OrderBackFormValues.js +1 -0
  20. package/dist/esm/utils/bsOrderBackFormValues.d.ts +1 -0
  21. package/dist/esm/utils/bsOrderBackFormValues.js +1 -0
  22. package/dist/esm/utils/gyOrderBackFormValues.d.ts +1 -0
  23. package/dist/esm/utils/gyOrderBackFormValues.js +1 -0
  24. package/dist/esm/utils/index.d.ts +2 -2
  25. package/dist/esm/utils/index.js +2 -2
  26. package/dist/esm/utils/jkyOrderBackFormValues.d.ts +92 -18
  27. package/dist/esm/utils/jkyOrderBackFormValues.js +178 -59
  28. package/dist/esm/utils/jstOrderBackFormValues.d.ts +1 -0
  29. package/dist/esm/utils/jstOrderBackFormValues.js +1 -0
  30. package/dist/esm/utils/jyOrderBackFormValues.d.ts +12 -0
  31. package/dist/esm/utils/jyOrderBackFormValues.js +19 -1
  32. package/dist/esm/utils/kmOrderBackFormValues.d.ts +11 -4
  33. package/dist/esm/utils/kmOrderBackFormValues.js +30 -4
  34. package/dist/esm/utils/orderBackFormValues.js +3 -1
  35. package/dist/esm/utils/transformList.js +1 -1
  36. package/dist/esm/utils/unTransField.js +1 -1
  37. package/dist/esm/utils/wdtOrderBackFormValues.d.ts +2 -0
  38. package/dist/esm/utils/wdtOrderBackFormValues.js +7 -3
  39. package/dist/esm/utils/wlnOrderBackFormValues.d.ts +1 -0
  40. package/dist/esm/utils/wlnOrderBackFormValues.js +1 -0
  41. package/package.json +2 -2
@@ -2,37 +2,111 @@ export declare const JKY_SYSTEM_ORDER_CONFIG: {
2
2
  key: string;
3
3
  name: string;
4
4
  selectId: string;
5
- columns: {
5
+ columns: ({
6
6
  dataIndex: string;
7
7
  title: string;
8
8
  width: number;
9
- }[];
9
+ render?: undefined;
10
+ renderExport?: undefined;
11
+ } | {
12
+ dataIndex: string;
13
+ title: string;
14
+ width: number;
15
+ render: (val: number) => "否" | "是";
16
+ renderExport: (val: number) => "否" | "是";
17
+ })[];
18
+ };
19
+ export declare const JKY_ORDER_FROM_MAP: {
20
+ "1": string;
21
+ "2": string;
22
+ "3": string;
23
+ "4": string;
24
+ "6": string;
25
+ "7": string;
26
+ "8": string;
27
+ "9": string;
28
+ "10": string;
29
+ "11": string;
30
+ "12": string;
31
+ "13": string;
32
+ "14": string;
33
+ "15": string;
34
+ "16": string;
35
+ "17": string;
36
+ "18": string;
37
+ "19": string;
38
+ "20": string;
39
+ "21": string;
40
+ "22": string;
41
+ "23": string;
42
+ "24": string;
43
+ "25": string;
44
+ "26": string;
45
+ "27": string;
46
+ "28": string;
47
+ "29": string;
10
48
  };
11
49
  export declare const JKY_ORDER_TYPE_MAP: {
12
- SALES: string;
13
- EXPENSE: string;
14
- SUBSCRIBES: string;
15
- EXCHANGE: string;
16
- REISSUE: string;
17
- INVOICE: string;
18
- WELFARE: string;
19
- OTHERS: string;
50
+ 1: string;
51
+ 2: string;
52
+ 3: string;
53
+ 4: string;
54
+ 5: string;
55
+ 6: string;
56
+ 7: string;
57
+ 8: string;
58
+ 9: string;
59
+ 10: string;
60
+ 11: string;
61
+ 12: string;
62
+ 13: string;
63
+ 14: string;
64
+ 15: string;
65
+ 16: string;
66
+ 91: string;
67
+ 92: string;
68
+ 93: string;
69
+ 94: string;
70
+ 95: string;
71
+ 96: string;
72
+ 97: string;
73
+ 98: string;
74
+ 99: string;
75
+ 100: string;
20
76
  };
21
77
  export declare const JKY_ORDER_STATUS_MAP: {
22
- CREATED: string;
23
- AUDITED_ABNORMAL: string;
24
- AUDITED: string;
25
- DISPATCHED_ABNORMAL: string;
26
- DISPATCHED: string;
27
- DELIVERY_ABNORMAL: string;
28
- DELIVERED: string;
29
- INVALID: string;
78
+ 1010: string;
79
+ 1020: string;
80
+ 1030: string;
81
+ 1050: string;
82
+ 2000: string;
83
+ 2010: string;
84
+ 2020: string;
85
+ 2030: string;
86
+ 2040: string;
87
+ 3010: string;
88
+ 4040: string;
89
+ 4041: string;
90
+ 4110: string;
91
+ 4111: string;
92
+ 4112: string;
93
+ 4113: string;
94
+ 4121: string;
95
+ 4122: string;
96
+ 4123: string;
97
+ 4130: string;
98
+ 5010: string;
99
+ 5020: string;
100
+ 5030: string;
101
+ 6000: string;
102
+ 9090: string;
30
103
  };
31
104
  export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
32
105
  export declare const updateJkyGoodsHandle: (orders?: any[], config?: {
33
106
  orderBackGoodsLevel?: string;
34
107
  canEdit?: boolean;
35
108
  }) => any[];
109
+ export declare const getJkyLogisticInfo: (item: any, typeKey: string) => any;
36
110
  export declare const jkyOrderTransform: (detail: any, form: any) => {
37
111
  jkySystemOrder: {
38
112
  orderNo: any;
@@ -12,6 +12,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
12
12
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
13
13
  import uuid from "./getUUid";
14
14
  import isNull from "./isNull";
15
+ import { SendDataCenter } from "./SendData";
15
16
  export var JKY_SYSTEM_ORDER_CONFIG = {
16
17
  key: "jkySystemShowOrder",
17
18
  name: "吉客云",
@@ -35,7 +36,13 @@ export var JKY_SYSTEM_ORDER_CONFIG = {
35
36
  }, {
36
37
  dataIndex: "isDelete",
37
38
  title: "是否删除",
38
- width: 150
39
+ width: 150,
40
+ render: function render(val) {
41
+ return val === undefined ? val : val == 1 ? "是" : "否";
42
+ },
43
+ renderExport: function renderExport(val) {
44
+ return val === undefined ? val : val == 1 ? "是" : "否";
45
+ }
39
46
  }, {
40
47
  dataIndex: "flagNames",
41
48
  title: "标记名称",
@@ -66,25 +73,90 @@ export var JKY_SYSTEM_ORDER_CONFIG = {
66
73
  width: 150
67
74
  }]
68
75
  };
76
+ export var JKY_ORDER_FROM_MAP = {
77
+ "1": "网店下载",
78
+ "2": "手工新建",
79
+ "3": "订单导入",
80
+ "4": "吉商城",
81
+ "6": "售后",
82
+ "7": "门店",
83
+ "8": "分销",
84
+ "9": "吉链采购",
85
+ "10": "吉链分销",
86
+ "11": "吉商城分销",
87
+ "12": "奇门分销",
88
+ "13": "销售返利",
89
+ "14": "门店补货",
90
+ "15": "吉秘机器人",
91
+ "16": "调拨",
92
+ "17": "吉客发",
93
+ "18": "开放平台",
94
+ "19": "生产推单",
95
+ "20": "吉秘助手",
96
+ "21": "意向单",
97
+ "22": "吉会员",
98
+ "23": "账单",
99
+ "24": "销售合同",
100
+ "25": "商机",
101
+ "26": "导购开单",
102
+ "27": "寄售结算",
103
+ "28": "货主收费",
104
+ "29": "WMS创建"
105
+ };
69
106
  export var JKY_ORDER_TYPE_MAP = {
70
- SALES: "销售订单",
71
- EXPENSE: "费用订单",
72
- SUBSCRIBES: "预订订单",
73
- EXCHANGE: "换货订单",
74
- REISSUE: "补发订单",
75
- INVOICE: "补发票订单",
76
- WELFARE: "福利订单",
77
- OTHERS: "其他订单"
107
+ 1: "零售业务",
108
+ 2: "代发货(来自分销商)",
109
+ 3: "预售订单",
110
+ 4: "周期性订购",
111
+ 5: "代销售(供货商发货)",
112
+ 6: "现款现货",
113
+ 7: "售后发货",
114
+ 8: "售后退货",
115
+ 9: "批发业务(B2B)",
116
+ 10: "试销业务",
117
+ 11: "错漏调整",
118
+ 12: "仅退款",
119
+ 13: "销售返利",
120
+ 14: "大B2B业务",
121
+ 15: "物流买赔",
122
+ 16: "销售对账差异",
123
+ 91: "自定义1",
124
+ 92: "自定义2",
125
+ 93: "自定义3",
126
+ 94: "自定义4",
127
+ 95: "自定义5",
128
+ 96: "自定义6",
129
+ 97: "自定义7",
130
+ 98: "自定义8",
131
+ 99: "自定义9",
132
+ 100: "自定义10"
78
133
  };
79
134
  export var JKY_ORDER_STATUS_MAP = {
80
- CREATED: "新建",
81
- AUDITED_ABNORMAL: "审核失败",
82
- AUDITED: "已审核",
83
- DISPATCHED_ABNORMAL: "配货异常",
84
- DISPATCHED: "已配货",
85
- DELIVERY_ABNORMAL: "平台发货异常",
86
- DELIVERED: "已发货",
87
- INVALID: "作废"
135
+ 1010: "待审核",
136
+ 1020: "审核中",
137
+ 1030: "预售",
138
+ 1050: "待复核",
139
+ 2000: "备货等待",
140
+ 2010: "备货等待等补货",
141
+ 2020: "服务等待",
142
+ 2030: "备货等待等生产",
143
+ 2040: "采购等待",
144
+ 3010: "虚拟发货",
145
+ 4040: "代销发货待递交",
146
+ 4041: "代销发货已递交",
147
+ 4110: "待发货待递交",
148
+ 4111: "待发货递交中",
149
+ 4112: "待发货已递交",
150
+ 4113: "待发货-递交失败",
151
+ 4121: "待发货-取消中",
152
+ 4122: "待发货已取消",
153
+ 4123: "待发货取消失败",
154
+ 4130: "待发货部分发货",
155
+ 5010: "已取消",
156
+ 5020: "已取消被合并",
157
+ 5030: "已取消被拆分",
158
+ 6000: "发货在途",
159
+ 9090: "已完成"
88
160
  };
89
161
  export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
90
162
  var getSortedList = function getSortedList(str) {
@@ -114,27 +186,45 @@ export var updateJkyGoodsHandle = function updateJkyGoodsHandle() {
114
186
  item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
115
187
  return _objectSpread(_objectSpread({}, item), {}, {
116
188
  canDelete: true,
117
- canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false,
118
- divideOrderFee: Number(item.divideOrderFee).toFixed(2),
119
- sellTotal: Number(item.sellTotal).toFixed(2),
120
- sellPrice: Number(item.sellPrice).toFixed(2),
121
- settlementPrice: Number(item.settlementPrice).toFixed(2),
122
- mallSellingPrice: Number(item.mallSellingPrice).toFixed(2)
189
+ canEdit: (_config$canEdit = config === null || config === void 0 ? void 0 : config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : false
123
190
  });
124
191
  });
125
192
  };
126
193
  return mappingGoodsItem((orders || []).reduce(function (prv, next) {
127
- if (next.subOrderDetails && next.subOrderDetails.length) {
128
- next.subOrderDetails.forEach(function (subItem) {
129
- if (config.orderBackGoodsLevel !== "2" && subItem.suits && subItem.suits.length) {
130
- subItem.suits.forEach(function (suit) {
131
- suit.systemOrderNo = next === null || next === void 0 ? void 0 : next.sid;
132
- });
133
- prv.push.apply(prv, _toConsumableArray(subItem.suits));
134
- } else {
135
- subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.sid;
136
- prv.push(subItem);
137
- }
194
+ var batchNos = [];
195
+ var sendCounts = [];
196
+ var productDates = [];
197
+ var expireDates = [];
198
+ if (config.orderBackGoodsLevel !== "2" && next.tradeOrderAssemblyGoodsDtoList && next.tradeOrderAssemblyGoodsDtoList.length) {
199
+ next.tradeOrderAssemblyGoodsDtoList.forEach(function (subItem) {
200
+ var _next$assemblyGoodsDe;
201
+ subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
202
+ next === null || next === void 0 ? void 0 : (_next$assemblyGoodsDe = next.assemblyGoodsDelivery) === null || _next$assemblyGoodsDe === void 0 ? void 0 : _next$assemblyGoodsDe.forEach(function (nxt) {
203
+ batchNos.push(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo);
204
+ productDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.productDate));
205
+ expireDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.expireDate));
206
+ });
207
+ subItem.batchNo = batchNos.join(",");
208
+ subItem.productDate = productDates.join(",");
209
+ subItem.expireDate = expireDates.join(",");
210
+ prv.push(subItem);
211
+ });
212
+ } else {
213
+ var _next$goodsDetail;
214
+ next === null || next === void 0 ? void 0 : (_next$goodsDetail = next.goodsDetail) === null || _next$goodsDetail === void 0 ? void 0 : _next$goodsDetail.forEach(function (subItem) {
215
+ var _next$goodsDelivery;
216
+ subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
217
+ next === null || next === void 0 ? void 0 : (_next$goodsDelivery = next.goodsDelivery) === null || _next$goodsDelivery === void 0 ? void 0 : _next$goodsDelivery.forEach(function (nxt) {
218
+ batchNos.push(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo);
219
+ sendCounts.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.sendCount));
220
+ productDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.productDate));
221
+ expireDates.push("".concat(nxt === null || nxt === void 0 ? void 0 : nxt.batchNo, ":").concat(nxt === null || nxt === void 0 ? void 0 : nxt.expireDate));
222
+ });
223
+ subItem.batchNo = batchNos.join(",");
224
+ subItem.sendCount = sendCounts.join(",");
225
+ subItem.productDate = productDates.join(",");
226
+ subItem.expireDate = expireDates.join(",");
227
+ prv.push(subItem);
138
228
  });
139
229
  }
140
230
  return prv;
@@ -144,7 +234,7 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
144
234
  var _newList;
145
235
  if (type === "logistics") {
146
236
  var _comList$find, _currentCom$component;
147
- //巨益物流信息组件
237
+ //吉客云物流信息组件
148
238
  var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
149
239
  return item.workOrderComponentType === "JKY_LOGISTICS";
150
240
  });
@@ -175,26 +265,41 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
175
265
  }
176
266
  }
177
267
  var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
178
- var items = ((next === null || next === void 0 ? void 0 : next.subOrderDetails) || []).map(function (t) {
268
+ var items = ((next === null || next === void 0 ? void 0 : next.goodsDetail) || []).map(function (t) {
179
269
  return {
180
- title: (t === null || t === void 0 ? void 0 : t.productName) || "",
181
- picUrl: (t === null || t === void 0 ? void 0 : t.imageUrl) || "",
270
+ title: (t === null || t === void 0 ? void 0 : t.goodsName) || "",
271
+ picUrl: (t === null || t === void 0 ? void 0 : t.skuImgUrl) || "",
182
272
  platform: "jky",
183
- skuId: (t === null || t === void 0 ? void 0 : t.productCode) || ""
273
+ skuId: (t === null || t === void 0 ? void 0 : t.goodsNo) || ""
184
274
  };
185
275
  });
186
- var params = {
187
- items: items
188
- };
189
276
  if (type === "logistics") {
190
- params.logisticsCompanyName = next === null || next === void 0 ? void 0 : next.logistName;
191
- params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticId;
192
- params.logisticsCode = next === null || next === void 0 ? void 0 : next.logisticNo;
193
- prv.push(params);
277
+ var _next$packageDetail;
278
+ // 吉客云单个系统子订单存在拆单,会包含多个物流信息
279
+ var packageDetailList = next !== null && next !== void 0 && next.packageDetail && (next === null || next === void 0 ? void 0 : (_next$packageDetail = next.packageDetail) === null || _next$packageDetail === void 0 ? void 0 : _next$packageDetail.length) > 1 ? next === null || next === void 0 ? void 0 : next.packageDetail : [{
280
+ logisticName: next === null || next === void 0 ? void 0 : next.logisticName,
281
+ logisticCode: next === null || next === void 0 ? void 0 : next.logisticCode,
282
+ logisticNo: next === null || next === void 0 ? void 0 : next.mainPostid
283
+ }];
284
+ console.log("packageDetailList", next, next.logisticCode, packageDetailList);
285
+ var packageDetails = (packageDetailList || []).map(function (t) {
286
+ return {
287
+ items: items,
288
+ logisticsCompanyName: t === null || t === void 0 ? void 0 : t.logisticName,
289
+ logisticsCompany: t === null || t === void 0 ? void 0 : t.logisticCode,
290
+ logisticsCode: t === null || t === void 0 ? void 0 : t.logisticNo
291
+ };
292
+ });
293
+ console.log("packageDetails", packageDetails);
294
+ prv.push.apply(prv, _toConsumableArray(packageDetails));
194
295
  } else if (type === "send") {
195
- params.sendId = next === null || next === void 0 ? void 0 : next.warehouseId;
296
+ var params = {
297
+ items: items
298
+ };
299
+ var warehouseCode = !(next !== null && next !== void 0 && next.warehouseCode) ? SendDataCenter.getInstance("jky").getSendCodeById(next === null || next === void 0 ? void 0 : next.warehouseId) : next === null || next === void 0 ? void 0 : next.warehouseCode;
300
+ params.sendId = warehouseCode;
196
301
  //下拉框,取id
197
- params.sendName = next === null || next === void 0 ? void 0 : next.warehouseId;
302
+ params.sendName = warehouseCode;
198
303
  params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
199
304
  prv.push(params);
200
305
  }
@@ -222,8 +327,18 @@ var updateJkyItemListHandle = function updateJkyItemListHandle(list, type, comLi
222
327
  }
223
328
  return newList;
224
329
  };
225
-
226
- //巨益订单信息转换
330
+ export var getJkyLogisticInfo = function getJkyLogisticInfo(item, typeKey) {
331
+ var _item$packageDetail, _packageDetail$map, _packageDetail$;
332
+ var packageDetail = item !== null && item !== void 0 && item.packageDetail && (item === null || item === void 0 ? void 0 : (_item$packageDetail = item.packageDetail) === null || _item$packageDetail === void 0 ? void 0 : _item$packageDetail.length) > 1 ? item === null || item === void 0 ? void 0 : item.packageDetail : [{
333
+ logisticName: item === null || item === void 0 ? void 0 : item.logisticName,
334
+ logisticCode: item === null || item === void 0 ? void 0 : item.logisticCode,
335
+ logisticNo: item === null || item === void 0 ? void 0 : item.mainPostid
336
+ }];
337
+ return (packageDetail === null || packageDetail === void 0 ? void 0 : packageDetail.length) > 1 ? packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$map = packageDetail.map(function (logistic, index) {
338
+ return "\u5305\u88F9".concat(index + 1, ":").concat(logistic === null || logistic === void 0 ? void 0 : logistic[typeKey]);
339
+ })) === null || _packageDetail$map === void 0 ? void 0 : _packageDetail$map.join(",") : (packageDetail === null || packageDetail === void 0 ? void 0 : (_packageDetail$ = packageDetail[0]) === null || _packageDetail$ === void 0 ? void 0 : _packageDetail$[typeKey]) || "";
340
+ };
341
+ //吉客云订单信息转换
227
342
  export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
228
343
  var _form$getFieldValue, _jkyReissueCom$compon, _jkyReturnCom$compone, _componentList$find, _componentList$find$c, _filterCurrentTrades$, _filterCurrentTrades$2, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
229
344
  var _detail$allOrders = detail.allOrders,
@@ -254,8 +369,12 @@ export var jkyOrderTransform = function jkyOrderTransform(detail, form) {
254
369
  var defaultOrder = filterCurrentTrades !== null && filterCurrentTrades !== void 0 && filterCurrentTrades[0] ? [filterCurrentTrades[0]] : [];
255
370
  var orders = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
256
371
  return _objectSpread(_objectSpread({}, item), {}, {
372
+ tradeFrom: JKY_ORDER_FROM_MAP[item.tradeFrom],
257
373
  tradeType: JKY_ORDER_TYPE_MAP[item.tradeType],
258
- tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus]
374
+ tradeStatus: JKY_ORDER_STATUS_MAP[item.tradeStatus],
375
+ logisticName: getJkyLogisticInfo(item, "logisticName"),
376
+ logisticCode: getJkyLogisticInfo(item, "logisticCode"),
377
+ logisticNo: getJkyLogisticInfo(item, "logisticNo")
259
378
  });
260
379
  });
261
380
  return {
@@ -380,13 +499,13 @@ var updateJkyItemListByConfigHandle = function updateJkyItemListByConfigHandle(l
380
499
  }, []);
381
500
  };
382
501
 
383
- // 巨益根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
502
+ // 根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
384
503
  export var filterJkyOrders = function filterJkyOrders(trades, order_no) {
385
- var currentTrades = (trades || []).filter(function (item) {
386
- return getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no);
387
- });
388
- if (currentTrades.length) {
389
- return currentTrades;
390
- }
391
- return [];
504
+ // const currentTrades = (trades || []).filter((item: Record<string, any>) =>
505
+ // getIsPlatformCodesIncludeOrderNos(item.tradeId, order_no),
506
+ // );
507
+ // if (currentTrades.length) {
508
+ // return currentTrades;
509
+ // }
510
+ return trades || [];
392
511
  };
@@ -2,6 +2,7 @@ export declare const JST_SYSTEM_ORDER_CONFIG: {
2
2
  key: string;
3
3
  name: string;
4
4
  selectId: string;
5
+ orderNo: string;
5
6
  columns: {
6
7
  dataIndex: string;
7
8
  title: string;
@@ -17,6 +17,7 @@ export var JST_SYSTEM_ORDER_CONFIG = {
17
17
  key: "jstSystemShowOrder",
18
18
  name: "聚水潭",
19
19
  selectId: "jstSystemSelectIds",
20
+ orderNo: "jstSystemOrderNo",
20
21
  columns: [{
21
22
  dataIndex: "orderType",
22
23
  title: "订单类型",
@@ -2,11 +2,23 @@ export declare const JY_SYSTEM_ORDER_CONFIG: {
2
2
  key: string;
3
3
  name: string;
4
4
  selectId: string;
5
+ orderNo: string;
5
6
  columns: {
6
7
  dataIndex: string;
7
8
  title: string;
8
9
  width: number;
9
10
  }[];
11
+ compoundConfig: (id: string) => ({
12
+ name: string;
13
+ id: string;
14
+ standardDateType?: undefined;
15
+ exampleValue?: undefined;
16
+ } | {
17
+ name: string;
18
+ id: string;
19
+ standardDateType: string;
20
+ exampleValue: string;
21
+ })[];
10
22
  };
11
23
  export declare const JY_ORDER_TYPE_MAP: {
12
24
  SALES: string;
@@ -6,10 +6,27 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
6
6
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
7
  import uuid from "./getUUid";
8
8
  import isNull from "./isNull";
9
+ var getCompoundConfig = function getCompoundConfig(id) {
10
+ return [{
11
+ name: "\u7ED1\u5B9A\u8BA2\u5355\u53F7",
12
+ id: "".concat(id, "_jySystemOrderNo")
13
+ }, {
14
+ name: "\u9009\u4E2D\u7CFB\u7EDF\u8BA2\u5355\u53F7",
15
+ id: "".concat(id, "_jySystemSelectIds"),
16
+ standardDateType: "Array",
17
+ exampleValue: '["1"]'
18
+ }, {
19
+ name: "\u5546\u54C1\u5217\u8868",
20
+ id: "".concat(id, "_jySystemShowOrder"),
21
+ standardDateType: "Array",
22
+ exampleValue: '[{"country":"","select":false,"payTime":"","isMallDeliveryAbnormal":0,"shopName":"","warehouseName":"","sourcePlatformName":"","fuzzyMobile":"","cityName":"","contact":"","modified":"","shopId":0,"tradeType":"","fuzzyAddress":"","tradeNo":"","districtName":"","mobile":"","sendTime":"","tradeTime":"","subOrderDetails":[{"gift":"","mallSellingPrice":0,"bfit":"","mallSkuId":"","productId":"","specCode":"","sellTotal":0,"mallProductId":"","sellPrice":0,"mallProductName":"","oid":"","uuid":"","productName":"","skuName":"","productCode":"","specName":"","mallSkuName":"","sellCount":0,"divideOrderFee":0,"settlementPrice":0,"goodsCode":"","systemOrderNo":"","goodsName":"","skuCode":""}],"sourcePlatformCode":"","warehouseId":0,"tradeStatus":"","endTime":"","provinceName":"","tradeId":"","fuzzyContact":""}]'
23
+ }];
24
+ };
9
25
  export var JY_SYSTEM_ORDER_CONFIG = {
10
26
  key: "jySystemShowOrder",
11
27
  name: "巨益",
12
28
  selectId: "jySystemSelectIds",
29
+ orderNo: "jySystemOrderNo",
13
30
  columns: [{
14
31
  dataIndex: "tradeNo",
15
32
  title: "系统订单号",
@@ -26,7 +43,8 @@ export var JY_SYSTEM_ORDER_CONFIG = {
26
43
  dataIndex: "sourcePlatformName",
27
44
  title: "来源平台",
28
45
  width: 150
29
- }]
46
+ }],
47
+ compoundConfig: getCompoundConfig
30
48
  };
31
49
  export var JY_ORDER_TYPE_MAP = {
32
50
  SALES: "销售订单",
@@ -1,6 +1,12 @@
1
+ export declare const kmSkuTypeMap: {
2
+ 0: string;
3
+ 1: string;
4
+ 2: string;
5
+ 3: string;
6
+ };
1
7
  export declare const handleKmAddressIdentify: (data: any) => any;
2
8
  export declare const kmOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
3
- declare const KM_ORDER_TYPE_MAP: {
9
+ export declare const KM_ORDER_TYPE_MAP: {
4
10
  "0": string;
5
11
  "1": string;
6
12
  "2": string;
@@ -74,9 +80,9 @@ declare const KM_ORDER_TYPE_MAP: {
74
80
  export declare const updateKmGoodsHandle: (orders?: any[], config?: {
75
81
  orderBackGoodsLevel?: string;
76
82
  canEdit?: boolean;
77
- }) => any[];
83
+ }, type?: string) => any[];
78
84
  export declare const getKmOrderTypeValue: (key: keyof typeof KM_ORDER_TYPE_MAP) => string;
79
- declare const KM_ORDER_STATUS: {
85
+ export declare const KM_ORDER_STATUS: {
80
86
  WAIT_BUYER_PAY: string;
81
87
  WAIT_AUDIT: string;
82
88
  WAIT_FINANCE_AUDIT: string;
@@ -97,6 +103,7 @@ export declare const KM_SYSTEM_ORDER_CONFIG: {
97
103
  key: string;
98
104
  name: string;
99
105
  selectId: string;
106
+ orderNo: string;
100
107
  columns: ({
101
108
  dataIndex: string;
102
109
  title: string;
@@ -139,6 +146,6 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
139
146
  };
140
147
  kmReissueGoods: any[];
141
148
  kmReturnGoods: any[];
149
+ kmExchangeGoods: any[];
142
150
  kmPosting: any;
143
151
  };
144
- export {};
@@ -13,6 +13,12 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
13
13
  import uuid from "./getUUid";
14
14
  import isNull from "./isNull";
15
15
  import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
16
+ export var kmSkuTypeMap = {
17
+ 0: "普通",
18
+ 1: "sku套件",
19
+ 2: "纯套件",
20
+ 3: "包材商品"
21
+ };
16
22
  export var handleKmAddressIdentify = function handleKmAddressIdentify(data) {
17
23
  //除省市区外信息都已加密,暂不返填
18
24
  var params = {
@@ -75,6 +81,16 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
75
81
  };
76
82
  }
77
83
  break;
84
+ case "KM_EXCHANGE_GOODS":
85
+ {
86
+ var _detail$kmGoods3;
87
+ prv[uniqueKey] = {
88
+ kmSystemOrder: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrder,
89
+ kmExchangeGoods: detail === null || detail === void 0 ? void 0 : detail.kmExchangeGoods,
90
+ shopCode: detail === null || detail === void 0 ? void 0 : (_detail$kmGoods3 = detail.kmGoods) === null || _detail$kmGoods3 === void 0 ? void 0 : _detail$kmGoods3.shopCode
91
+ };
92
+ }
93
+ break;
78
94
  case "POSTING":
79
95
  {
80
96
  if (detail !== null && detail !== void 0 && detail.kmPosting) {
@@ -94,7 +110,7 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
94
110
  return prv;
95
111
  }, {});
96
112
  };
97
- var KM_ORDER_TYPE_MAP = {
113
+ export var KM_ORDER_TYPE_MAP = {
98
114
  "0": "普通订单",
99
115
  "1": "货到付款",
100
116
  "2": "纯平台订单(包含平台单拆出去的手工单)",
@@ -168,6 +184,7 @@ var KM_ORDER_TYPE_MAP = {
168
184
  export var updateKmGoodsHandle = function updateKmGoodsHandle() {
169
185
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
170
186
  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
187
+ var type = arguments.length > 2 ? arguments[2] : undefined;
171
188
  var mappingGoodsItem = function mappingGoodsItem(list) {
172
189
  return (list || []).map(function (item) {
173
190
  var _item$uuid;
@@ -178,13 +195,15 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
178
195
  num: item.itemNum || item.num,
179
196
  realNum: item.itemNum || item.num,
180
197
  desiredNum: item.itemNum || item.num,
181
- type: item.erpOrderType,
198
+ type: item.type || (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]),
182
199
  itemSysId: item.sysItemId,
183
200
  skuSysId: item.sysSkuId,
184
201
  sysPicPath: item.picUrl,
185
202
  canDelete: true,
186
203
  canEdit: !!config.canEdit
187
- });
204
+ }, type === "KM_RETURN_GOODS" ? {
205
+ refundMoney: item.price * (item.itemNum || item.num)
206
+ } : {});
188
207
  });
189
208
  };
190
209
  return mappingGoodsItem((orders || []).reduce(function (prv, next) {
@@ -208,7 +227,7 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
208
227
  export var getKmOrderTypeValue = function getKmOrderTypeValue(key) {
209
228
  return KM_ORDER_TYPE_MAP[key] || key;
210
229
  };
211
- var KM_ORDER_STATUS = {
230
+ export var KM_ORDER_STATUS = {
212
231
  WAIT_BUYER_PAY: "待付款",
213
232
  WAIT_AUDIT: "待审核",
214
233
  WAIT_FINANCE_AUDIT: "等待财审",
@@ -229,6 +248,7 @@ export var KM_SYSTEM_ORDER_CONFIG = {
229
248
  key: "kmSystemShowOrder",
230
249
  name: "快麦",
231
250
  selectId: "kmSystemSelectIds",
251
+ orderNo: "kmSystemOrderNo",
232
252
  columns: [{
233
253
  dataIndex: "billType",
234
254
  title: "订单类型",
@@ -465,6 +485,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
465
485
  kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
466
486
  orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
467
487
  canEdit: true
488
+ }, "KM_RETURN_GOODS").filter(function (good) {
489
+ return !isStrict || !orderNo || good.sid === orderNo;
490
+ }) : [],
491
+ kmExchangeGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
492
+ orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
493
+ canEdit: true
468
494
  }).filter(function (good) {
469
495
  return !isStrict || !orderNo || good.sid === orderNo;
470
496
  }) : [],