@things-factory/integration-marketplace 4.3.461 → 4.3.464
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.
- package/dist-server/controllers/shopee/apis2/get-logistics-param.js +10 -6
- package/dist-server/controllers/shopee/apis2/get-logistics-param.js.map +1 -1
- package/dist-server/controllers/shopee/apis2/get-store-order-by-batch.js +9 -1
- package/dist-server/controllers/shopee/apis2/get-store-order-by-batch.js.map +1 -1
- package/dist-server/controllers/shopee/apis2/init-logistics.js +15 -7
- package/dist-server/controllers/shopee/apis2/init-logistics.js.map +1 -1
- package/package.json +3 -3
- package/server/controllers/shopee/apis2/get-logistics-param.ts +12 -3
- package/server/controllers/shopee/apis2/get-store-order-by-batch.ts +10 -1
- package/server/controllers/shopee/apis2/init-logistics.ts +14 -7
|
@@ -7,13 +7,17 @@ function getLogisticsParam() {
|
|
|
7
7
|
path: '/logistics/get_shipping_parameter',
|
|
8
8
|
method: 'getV2',
|
|
9
9
|
denormalize(req) {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
let { orderNo, packageId, isMultipackage } = req;
|
|
11
|
+
let data = {
|
|
12
12
|
order_sn: orderNo
|
|
13
13
|
};
|
|
14
|
+
if (packageId && isMultipackage) {
|
|
15
|
+
data = Object.assign(Object.assign({}, data), { package_number: packageId });
|
|
16
|
+
}
|
|
17
|
+
return data;
|
|
14
18
|
},
|
|
15
19
|
normalize(res) {
|
|
16
|
-
var _a, _b, _c
|
|
20
|
+
var _a, _b, _c;
|
|
17
21
|
const infoNeeded = res.info_needed;
|
|
18
22
|
let logisticsDetail;
|
|
19
23
|
if (((_a = infoNeeded === null || infoNeeded === void 0 ? void 0 : infoNeeded.pickup) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
@@ -29,17 +33,17 @@ function getLogisticsParam() {
|
|
|
29
33
|
});
|
|
30
34
|
logisticsDetail = { pickup: (addressList === null || addressList === void 0 ? void 0 : addressList.length) ? addressList : [] };
|
|
31
35
|
}
|
|
32
|
-
if (
|
|
36
|
+
if (infoNeeded === null || infoNeeded === void 0 ? void 0 : infoNeeded.dropoff) {
|
|
33
37
|
const dropoff = res.dropoff;
|
|
34
38
|
let branchList = [];
|
|
35
|
-
if ((
|
|
39
|
+
if ((_b = dropoff === null || dropoff === void 0 ? void 0 : dropoff.branch_list) === null || _b === void 0 ? void 0 : _b.length) {
|
|
36
40
|
branchList = dropoff.branch_list.map(branch => {
|
|
37
41
|
return Object.assign(Object.assign({}, branch), { branchId: branch.branch_id });
|
|
38
42
|
});
|
|
39
43
|
}
|
|
40
44
|
logisticsDetail = { dropoff: (branchList === null || branchList === void 0 ? void 0 : branchList.length) ? branchList : [] };
|
|
41
45
|
}
|
|
42
|
-
if (((
|
|
46
|
+
if (((_c = infoNeeded === null || infoNeeded === void 0 ? void 0 : infoNeeded.non_integrated) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
43
47
|
logisticsDetail = { non_integrated: infoNeeded.non_integrated };
|
|
44
48
|
}
|
|
45
49
|
const result = Object.assign(Object.assign({}, infoNeeded), { logisticsDetail });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-logistics-param.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-logistics-param.ts"],"names":[],"mappings":";AAAA,+FAA+F;;;AAE/F,SAAgB,iBAAiB;IAC/B,OAAO;QACL,IAAI,EAAE,mCAAmC;QACzC,MAAM,EAAE,OAAO;QACf,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"get-logistics-param.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-logistics-param.ts"],"names":[],"mappings":";AAAA,+FAA+F;;;AAE/F,SAAgB,iBAAiB;IAC/B,OAAO;QACL,IAAI,EAAE,mCAAmC;QACzC,MAAM,EAAE,OAAO;QACf,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;YAEhD,IAAI,IAAI,GAAQ;gBACd,QAAQ,EAAE,OAAO;aAClB,CAAA;YAED,IAAI,SAAS,IAAI,cAAc,EAAE;gBAC/B,IAAI,mCACC,IAAI,KACP,cAAc,EAAE,SAAS,GAC1B,CAAA;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC;QACD,SAAS,CAAC,GAAG;;YACX,MAAM,UAAU,GAAQ,GAAG,CAAC,WAAW,CAAA;YACvC,IAAI,eAAoB,CAAA;YAExB,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAClC,IAAI,WAAW,GAAU,EAAE,CAAA;gBAC3B,MAAM,MAAM,GAAQ,GAAG,CAAC,MAAM,CAAA;gBAE9B,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;;oBAC9C,uCACK,OAAO,KACV,SAAS,EAAE,OAAO,CAAC,UAAU,EAC7B,QAAQ,EACN,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,KAAI,CAAC,CAAA,MAAA,OAAO,CAAC,cAAc,0CAAE,KAAK,CAAA;4BACvD,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gCAC9B,uCACK,EAAE,KACL,UAAU,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,YAAY,EAAE,EACnD,YAAY,EAAE,EAAE,CAAC,cAAc,EAC/B,QAAQ,EAAE,EAAE,CAAC,SAAS,IACvB;4BACH,CAAC,CAAC;4BACJ,CAAC,CAAC,EAAE,IACT;gBACH,CAAC,CAAC,CAAA;gBAEF,eAAe,GAAG,EAAE,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;aACrE;YAED,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE;gBACvB,MAAM,OAAO,GAAQ,GAAG,CAAC,OAAO,CAAA;gBAChC,IAAI,UAAU,GAAU,EAAE,CAAA;gBAE1B,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,0CAAE,MAAM,EAAE;oBAChC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;wBAC5C,uCACK,MAAM,KACT,QAAQ,EAAE,MAAM,CAAC,SAAS,IAC3B;oBACH,CAAC,CAAC,CAAA;iBACH;gBACD,eAAe,GAAG,EAAE,OAAO,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;aACpE;YAED,IAAI,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,0CAAE,MAAM,IAAG,CAAC,EAAE;gBAC1C,eAAe,GAAG,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE,CAAA;aAChE;YAED,MAAM,MAAM,mCAAQ,UAAU,KAAE,eAAe,GAAE,CAAA;YACjD,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;AACH,CAAC;AAxED,8CAwEC"}
|
|
@@ -22,7 +22,8 @@ function getStoreOrderByBatch() {
|
|
|
22
22
|
'pay_time',
|
|
23
23
|
'cancel_by',
|
|
24
24
|
'cancel_reason',
|
|
25
|
-
'actual_shipping_fee_confirmed'
|
|
25
|
+
'actual_shipping_fee_confirmed',
|
|
26
|
+
'package_list'
|
|
26
27
|
]
|
|
27
28
|
};
|
|
28
29
|
},
|
|
@@ -43,6 +44,7 @@ function getStoreOrderByBatch() {
|
|
|
43
44
|
const result = Object.assign(Object.assign({ name: order.order_sn, orderNo: order.order_sn, docRefNo: order.order_sn, status: order.order_status.toLowerCase(), orderCreatedAt: new Date(order.create_time * 1000), orderUpdatedAt: new Date(order.update_time * 1000), totalAmount: order.total_amount, cancelBy: order === null || order === void 0 ? void 0 : order.cancel_by, reason: order === null || order === void 0 ? void 0 : order.cancel_reason, paymentMethod: order === null || order === void 0 ? void 0 : order.payment_method, recipientAddress: recipientAddress ? JSON.stringify(recipientAddress) : null, shippingProvider: order.shipping_carrier, itemCount: order.item_list.length, buyerUsername: order.buyer_username, payTime: (order === null || order === void 0 ? void 0 : order.pay_time) ? new Date(order.pay_time * 1000) : null, orderItems: order.item_list.map(item => {
|
|
44
45
|
return {
|
|
45
46
|
name: item.item_id,
|
|
47
|
+
orderItemId: item.order_item_id,
|
|
46
48
|
variationId: item.model_id == 0 ? item.item_id : item.model_id,
|
|
47
49
|
qty: item.model_quantity_purchased,
|
|
48
50
|
paidPrice: item.model_discounted_price * item.model_quantity_purchased,
|
|
@@ -55,6 +57,12 @@ function getStoreOrderByBatch() {
|
|
|
55
57
|
discount: item.model_quantity_purchased * item.model_original_price -
|
|
56
58
|
item.model_quantity_purchased * item.model_discounted_price
|
|
57
59
|
};
|
|
60
|
+
}), packageList: order.package_list.map(item => {
|
|
61
|
+
return {
|
|
62
|
+
packageId: item.package_number,
|
|
63
|
+
transporter: item.shipping_carrier,
|
|
64
|
+
packageItem: item.item_list.map(itm => ({ itemId: itm.item_id, orderItemId: itm.order_item_id }))
|
|
65
|
+
};
|
|
58
66
|
}), orderShipping: {
|
|
59
67
|
address1: recipientAddress === null || recipientAddress === void 0 ? void 0 : recipientAddress.full_address,
|
|
60
68
|
phone1: recipientAddress === null || recipientAddress === void 0 ? void 0 : recipientAddress.phone,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-store-order-by-batch.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-store-order-by-batch.ts"],"names":[],"mappings":";AAAA,qFAAqF;;;AAErF,+CAA0C;AAE1C,SAAgB,oBAAoB;IAClC,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,MAAM,EAAE,OAAO;QACf,WAAW,CAAC,GAAG;YACb,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAA;YAE3B,OAAO;gBACL,aAAa,EAAE,WAAW;gBAC1B,wBAAwB,EAAE;oBACxB,mBAAmB;oBACnB,WAAW;oBACX,cAAc;oBACd,kBAAkB;oBAClB,wBAAwB;oBACxB,gBAAgB;oBAChB,qBAAqB;oBACrB,UAAU;oBACV,WAAW;oBACX,eAAe;oBACf,+BAA+B;
|
|
1
|
+
{"version":3,"file":"get-store-order-by-batch.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/get-store-order-by-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,26 +7,34 @@ function initLogistics() {
|
|
|
7
7
|
path: '/logistics/ship_order',
|
|
8
8
|
method: 'postV2',
|
|
9
9
|
denormalize(req) {
|
|
10
|
-
var { orderNo: order_sn, deliveryType } = req;
|
|
10
|
+
var { orderNo: order_sn, packageId, deliveryType, isMultipackage } = req;
|
|
11
11
|
let pickup = {};
|
|
12
12
|
let dropoff = {};
|
|
13
13
|
let non_integrated = {};
|
|
14
|
-
let args = {};
|
|
14
|
+
let args = { order_sn };
|
|
15
|
+
if (packageId && isMultipackage) {
|
|
16
|
+
args = Object.assign(Object.assign({}, args), { package_number: packageId });
|
|
17
|
+
}
|
|
15
18
|
if (deliveryType === null || deliveryType === void 0 ? void 0 : deliveryType.pickup) {
|
|
16
19
|
var { addressId, pickupTimeId: pickup_time_id } = deliveryType.pickup;
|
|
17
20
|
var address_id = parseInt(addressId);
|
|
18
21
|
pickup = { address_id, pickup_time_id };
|
|
19
|
-
args = {
|
|
22
|
+
args = Object.assign(Object.assign({}, args), { pickup: Object.assign({}, pickup) });
|
|
20
23
|
}
|
|
21
24
|
if (deliveryType === null || deliveryType === void 0 ? void 0 : deliveryType.non_integrated) {
|
|
22
25
|
var { trackingNo: tracking_number } = deliveryType.non_integrated;
|
|
23
26
|
non_integrated = { tracking_number };
|
|
24
|
-
args = {
|
|
27
|
+
args = Object.assign(Object.assign({}, args), { non_integrated: { tracking_number } });
|
|
25
28
|
}
|
|
26
29
|
if (deliveryType === null || deliveryType === void 0 ? void 0 : deliveryType.dropoff) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
if (deliveryType === null || deliveryType === void 0 ? void 0 : deliveryType.dropoff.branchId) {
|
|
31
|
+
var { branchId: branch_id } = deliveryType.dropoff;
|
|
32
|
+
dropoff = { branch_id };
|
|
33
|
+
args = Object.assign(Object.assign({}, args), { dropoff: Object.assign({}, dropoff) });
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
args = Object.assign(Object.assign({}, args), { dropoff });
|
|
37
|
+
}
|
|
30
38
|
}
|
|
31
39
|
return args;
|
|
32
40
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-logistics.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/init-logistics.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,SAAgB,aAAa;IAC3B,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,QAAQ;QAChB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"init-logistics.js","sourceRoot":"","sources":["../../../../server/controllers/shopee/apis2/init-logistics.ts"],"names":[],"mappings":";AAAA,8DAA8D;;;AAE9D,SAAgB,aAAa;IAC3B,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,QAAQ;QAChB,WAAW,CAAC,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,GAAG,CAAA;YACxE,IAAI,MAAM,GAAG,EAAE,CAAA;YACf,IAAI,OAAO,GAAG,EAAE,CAAA;YAChB,IAAI,cAAc,GAAG,EAAE,CAAA;YACvB,IAAI,IAAI,GAAQ,EAAE,QAAQ,EAAE,CAAA;YAC5B,IAAI,SAAS,IAAI,cAAc,EAAE;gBAC/B,IAAI,mCAAQ,IAAI,KAAE,cAAc,EAAE,SAAS,GAAE,CAAA;aAC9C;YAED,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE;gBACxB,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC,MAAM,CAAA;gBACrE,IAAI,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACpC,MAAM,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,CAAA;gBACvC,IAAI,mCAAQ,IAAI,KAAE,MAAM,oBAAO,MAAM,IAAI,CAAA;aAC1C;YAED,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAc,EAAE;gBAChC,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC,cAAc,CAAA;gBACjE,cAAc,GAAG,EAAE,eAAe,EAAE,CAAA;gBACpC,IAAI,mCAAQ,IAAI,KAAE,cAAc,EAAE,EAAE,eAAe,EAAE,GAAE,CAAA;aACxD;YAED,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE;gBACzB,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC,QAAQ,EAAE;oBAClC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,OAAO,CAAA;oBAClD,OAAO,GAAG,EAAE,SAAS,EAAE,CAAA;oBACvB,IAAI,mCAAQ,IAAI,KAAE,OAAO,oBAAO,OAAO,IAAI,CAAA;iBAC5C;qBAAM;oBACL,IAAI,mCAAQ,IAAI,KAAE,OAAO,GAAE,CAAA;iBAC5B;aACF;YAED,OAAO,IAAI,CAAA;QACb,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA3CD,sCA2CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-marketplace",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.464",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@things-factory/context-ui": "^4.3.434",
|
|
32
32
|
"@things-factory/grist-ui": "^4.3.434",
|
|
33
33
|
"@things-factory/i18n-base": "^4.3.434",
|
|
34
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
34
|
+
"@things-factory/integration-lmd": "^4.3.464",
|
|
35
35
|
"@things-factory/integration-ui": "^4.3.452",
|
|
36
36
|
"@things-factory/more-ui": "^4.3.434",
|
|
37
37
|
"@things-factory/resource-ui": "^4.3.452",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"nock": "^13.0.2",
|
|
52
52
|
"should": "^13.2.3"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "dc2feb22015b76dc2ccb311676a5fdf2ef2c6372"
|
|
55
55
|
}
|
|
@@ -5,11 +5,20 @@ export function getLogisticsParam() {
|
|
|
5
5
|
path: '/logistics/get_shipping_parameter',
|
|
6
6
|
method: 'getV2',
|
|
7
7
|
denormalize(req) {
|
|
8
|
-
|
|
8
|
+
let { orderNo, packageId, isMultipackage } = req
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
let data: any = {
|
|
11
11
|
order_sn: orderNo
|
|
12
12
|
}
|
|
13
|
+
|
|
14
|
+
if (packageId && isMultipackage) {
|
|
15
|
+
data = {
|
|
16
|
+
...data,
|
|
17
|
+
package_number: packageId
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return data
|
|
13
22
|
},
|
|
14
23
|
normalize(res) {
|
|
15
24
|
const infoNeeded: any = res.info_needed
|
|
@@ -40,7 +49,7 @@ export function getLogisticsParam() {
|
|
|
40
49
|
logisticsDetail = { pickup: addressList?.length ? addressList : [] }
|
|
41
50
|
}
|
|
42
51
|
|
|
43
|
-
if (infoNeeded?.dropoff
|
|
52
|
+
if (infoNeeded?.dropoff) {
|
|
44
53
|
const dropoff: any = res.dropoff
|
|
45
54
|
let branchList: any[] = []
|
|
46
55
|
|
|
@@ -22,7 +22,8 @@ export function getStoreOrderByBatch() {
|
|
|
22
22
|
'pay_time',
|
|
23
23
|
'cancel_by',
|
|
24
24
|
'cancel_reason',
|
|
25
|
-
'actual_shipping_fee_confirmed'
|
|
25
|
+
'actual_shipping_fee_confirmed',
|
|
26
|
+
'package_list'
|
|
26
27
|
]
|
|
27
28
|
}
|
|
28
29
|
},
|
|
@@ -57,6 +58,7 @@ export function getStoreOrderByBatch() {
|
|
|
57
58
|
orderItems: order.item_list.map(item => {
|
|
58
59
|
return {
|
|
59
60
|
name: item.item_id,
|
|
61
|
+
orderItemId: item.order_item_id,
|
|
60
62
|
variationId: item.model_id == 0 ? item.item_id : item.model_id,
|
|
61
63
|
qty: item.model_quantity_purchased,
|
|
62
64
|
paidPrice: item.model_discounted_price * item.model_quantity_purchased,
|
|
@@ -71,6 +73,13 @@ export function getStoreOrderByBatch() {
|
|
|
71
73
|
item.model_quantity_purchased * item.model_discounted_price
|
|
72
74
|
}
|
|
73
75
|
}),
|
|
76
|
+
packageList: order.package_list.map(item => {
|
|
77
|
+
return {
|
|
78
|
+
packageId: item.package_number,
|
|
79
|
+
transporter: item.shipping_carrier,
|
|
80
|
+
packageItem: item.item_list.map(itm => ({ itemId: itm.item_id, orderItemId: itm.order_item_id }))
|
|
81
|
+
}
|
|
82
|
+
}),
|
|
74
83
|
orderShipping: {
|
|
75
84
|
address1: recipientAddress?.full_address,
|
|
76
85
|
phone1: recipientAddress?.phone,
|
|
@@ -5,29 +5,36 @@ export function initLogistics() {
|
|
|
5
5
|
path: '/logistics/ship_order',
|
|
6
6
|
method: 'postV2',
|
|
7
7
|
denormalize(req) {
|
|
8
|
-
var { orderNo: order_sn, deliveryType } = req
|
|
8
|
+
var { orderNo: order_sn, packageId, deliveryType, isMultipackage } = req
|
|
9
9
|
let pickup = {}
|
|
10
10
|
let dropoff = {}
|
|
11
11
|
let non_integrated = {}
|
|
12
|
-
let args = {}
|
|
12
|
+
let args: any = { order_sn }
|
|
13
|
+
if (packageId && isMultipackage) {
|
|
14
|
+
args = { ...args, package_number: packageId }
|
|
15
|
+
}
|
|
13
16
|
|
|
14
17
|
if (deliveryType?.pickup) {
|
|
15
18
|
var { addressId, pickupTimeId: pickup_time_id } = deliveryType.pickup
|
|
16
19
|
var address_id = parseInt(addressId)
|
|
17
20
|
pickup = { address_id, pickup_time_id }
|
|
18
|
-
args = {
|
|
21
|
+
args = { ...args, pickup: { ...pickup } }
|
|
19
22
|
}
|
|
20
23
|
|
|
21
24
|
if (deliveryType?.non_integrated) {
|
|
22
25
|
var { trackingNo: tracking_number } = deliveryType.non_integrated
|
|
23
26
|
non_integrated = { tracking_number }
|
|
24
|
-
args = {
|
|
27
|
+
args = { ...args, non_integrated: { tracking_number } }
|
|
25
28
|
}
|
|
26
29
|
|
|
27
30
|
if (deliveryType?.dropoff) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
if (deliveryType?.dropoff.branchId) {
|
|
32
|
+
var { branchId: branch_id } = deliveryType.dropoff
|
|
33
|
+
dropoff = { branch_id }
|
|
34
|
+
args = { ...args, dropoff: { ...dropoff } }
|
|
35
|
+
} else {
|
|
36
|
+
args = { ...args, dropoff }
|
|
37
|
+
}
|
|
31
38
|
}
|
|
32
39
|
|
|
33
40
|
return args
|