|
@@ -783,6 +783,15 @@ class OrderController extends BaseController
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $getGoods = $post['getGoods'] ?? 0;
|
|
|
|
|
+ if ($getGoods == 1) {
|
|
|
|
|
+ //到店自取订单,并且是待取货状态,则自动完成取货
|
|
|
|
|
+ if ($order->sendType == 1 && $order->status == 2) {
|
|
|
|
|
+ $order->status = 4;
|
|
|
|
|
+ $order->save();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$transaction->commit();
|
|
$transaction->commit();
|
|
|
|
|
|
|
|
if ($order->fromType == 3 || $order->fromType == 4) {
|
|
if ($order->fromType == 3 || $order->fromType == 4) {
|