|
|
@@ -35,6 +35,10 @@ class OrderController extends Controller
|
|
|
$cgId = $order['purchaseId'] ?? 0;
|
|
|
$info = PurchaseClass::getById($cgId, true);
|
|
|
if (!empty($info)) {
|
|
|
+ //预订单不能自动确认收货
|
|
|
+ if ($info->book == 1) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
PurchaseClass::confirmTake($info);
|
|
|
}
|
|
|
$transaction->commit();
|
|
|
@@ -67,10 +71,6 @@ class OrderController extends Controller
|
|
|
$transaction = $connection->beginTransaction();
|
|
|
$orderSn = $cg['orderSn'] ?? '';
|
|
|
$id = $cg['id'] ?? 0;
|
|
|
- //预订单不需要自动确认收货
|
|
|
- if (isset($cg['book']) && $cg['book'] == 1) {
|
|
|
- continue;
|
|
|
- }
|
|
|
try {
|
|
|
$info = PurchaseClass::getById($id, true);
|
|
|
if (!empty($info)) {
|