@pisell/pisellos 0.0.199 → 0.0.201
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/modules/Cart/utils/cartResource.js +1 -1
- package/dist/modules/Payment/index.js +22 -11
- package/dist/modules/Resource/types.d.ts +1 -0
- package/lib/modules/Cart/utils/cartResource.js +1 -1
- package/lib/modules/Payment/index.js +8 -0
- package/lib/modules/Resource/types.d.ts +1 -0
- package/package.json +1 -1
|
@@ -46,7 +46,7 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
|
|
|
46
46
|
}
|
|
47
47
|
var obj = {
|
|
48
48
|
relation_type: 'form',
|
|
49
|
-
like_status: 'common',
|
|
49
|
+
like_status: resource.like_status || 'common',
|
|
50
50
|
id: resource.id,
|
|
51
51
|
main_field: resource.main_field,
|
|
52
52
|
resourceType: resource.resourceType,
|
|
@@ -1245,30 +1245,41 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
1245
1245
|
_context15.next = 8;
|
|
1246
1246
|
return this.dbManager.update('order', order);
|
|
1247
1247
|
case 8:
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1248
|
+
if (!(paymentData.payments.length === 0)) {
|
|
1249
|
+
_context15.next = 12;
|
|
1250
|
+
break;
|
|
1251
|
+
}
|
|
1252
|
+
console.log("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u5217\u8868\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7\u961F\u5217\u63A8\u9001"));
|
|
1253
|
+
this.logWarning('Empty payment queue submission', {
|
|
1254
|
+
orderUuid: order.uuid,
|
|
1255
|
+
orderId: order.order_info.order_id
|
|
1256
|
+
});
|
|
1257
|
+
return _context15.abrupt("return");
|
|
1253
1258
|
case 12:
|
|
1254
1259
|
_context15.next = 14;
|
|
1260
|
+
return this.addToSyncQueue(order, paymentData);
|
|
1261
|
+
case 14:
|
|
1262
|
+
_context15.next = 16;
|
|
1263
|
+
return this.core.effects.emit(PaymentHooks.OnPaymentSubmitted, order);
|
|
1264
|
+
case 16:
|
|
1265
|
+
_context15.next = 18;
|
|
1255
1266
|
return this.core.effects.emit(PaymentHooks.OnOrderChanged, {
|
|
1256
1267
|
action: 'submit',
|
|
1257
1268
|
order: order
|
|
1258
1269
|
});
|
|
1259
|
-
case
|
|
1260
|
-
_context15.next =
|
|
1270
|
+
case 18:
|
|
1271
|
+
_context15.next = 24;
|
|
1261
1272
|
break;
|
|
1262
|
-
case
|
|
1263
|
-
_context15.prev =
|
|
1273
|
+
case 20:
|
|
1274
|
+
_context15.prev = 20;
|
|
1264
1275
|
_context15.t0 = _context15["catch"](0);
|
|
1265
1276
|
console.error("[PaymentModule] \u8BA2\u5355 ".concat(order.uuid, " \u652F\u4ED8\u63D0\u4EA4\u5931\u8D25"), _context15.t0);
|
|
1266
1277
|
throw _context15.t0;
|
|
1267
|
-
case
|
|
1278
|
+
case 24:
|
|
1268
1279
|
case "end":
|
|
1269
1280
|
return _context15.stop();
|
|
1270
1281
|
}
|
|
1271
|
-
}, _callee15, this, [[0,
|
|
1282
|
+
}, _callee15, this, [[0, 20]]);
|
|
1272
1283
|
}));
|
|
1273
1284
|
function submitSingleOrderPayment(_x19) {
|
|
1274
1285
|
return _submitSingleOrderPayment.apply(this, arguments);
|
|
@@ -74,7 +74,7 @@ var formatResourceToCartItemOrigin = (params) => {
|
|
|
74
74
|
}
|
|
75
75
|
const obj = {
|
|
76
76
|
relation_type: "form",
|
|
77
|
-
like_status: "common",
|
|
77
|
+
like_status: resource.like_status || "common",
|
|
78
78
|
id: resource.id,
|
|
79
79
|
main_field: resource.main_field,
|
|
80
80
|
resourceType: resource.resourceType,
|
|
@@ -588,6 +588,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
|
|
|
588
588
|
}
|
|
589
589
|
paymentData.payment_status = order.payment_status === import_types.PaymentStatus.Finished ? "paid" : "partially_paid";
|
|
590
590
|
await this.dbManager.update("order", order);
|
|
591
|
+
if (paymentData.payments.length === 0) {
|
|
592
|
+
console.log(`[PaymentModule] 订单 ${order.uuid} 支付列表为空,跳过队列推送`);
|
|
593
|
+
this.logWarning("Empty payment queue submission", {
|
|
594
|
+
orderUuid: order.uuid,
|
|
595
|
+
orderId: order.order_info.order_id
|
|
596
|
+
});
|
|
597
|
+
return;
|
|
598
|
+
}
|
|
591
599
|
await this.addToSyncQueue(order, paymentData);
|
|
592
600
|
await this.core.effects.emit(import_types.PaymentHooks.OnPaymentSubmitted, order);
|
|
593
601
|
await this.core.effects.emit(import_types.PaymentHooks.OnOrderChanged, {
|