|
@@ -337,7 +337,7 @@ class DeliveryController extends BaseController
|
|
|
$ret = $ds->createOrder($ghsOrder, 'xhGhsOrder', $this->shopId, $params);
|
|
$ret = $ds->createOrder($ghsOrder, 'xhGhsOrder', $this->shopId, $params);
|
|
|
|
|
|
|
|
if (isset($ret['code']) && $ret['code'] == 0) {
|
|
if (isset($ret['code']) && $ret['code'] == 0) {
|
|
|
- $gdo = GhsDeliveryOrderClass::getByCondition(['mainId' => $this->mainId, 'orderId' => $ret['data']['orderId'], 'orderStatus!=' => -1]);
|
|
|
|
|
|
|
+ $gdo = GhsDeliveryOrderClass::getByCondition(['mainId' => $this->mainId, 'orderId' => $ret['data']['orderId'], 'orderStatus!=' => -1], true);
|
|
|
if (empty($gdo)) {
|
|
if (empty($gdo)) {
|
|
|
$data = [
|
|
$data = [
|
|
|
'mainId' => $this->mainId,
|
|
'mainId' => $this->mainId,
|