diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index e7617cb54..48d90b499 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -566,10 +566,19 @@ class StoreOrder extends AuthController $orderInfo->refund_status = 0; $orderInfo->refund_type = 3; $orderInfo->save(); + if ($orderInfo->pid > 0) { + $res1 = $this->services->getCount([ + ['pid', '=', $orderInfo->pid], + ['refund_type', '>', 0], + ['refund_type', '<>', 3], + ]); + if ($res1 == 0) { + $this->services->update($orderInfo->pid, ['refund_status' => 0]); + } + } $services->storeProductOrderRefundNo((int)$id, $refund_reason); //提醒推送 event('notice.notice', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']); -// return app('json')->success('Modified success'); } diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index b587e57e7..7759f6a52 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -428,6 +428,16 @@ class StoreOrderDeliveryServices extends BaseServices throw new ValidateException('暂时不支持其他发货类型'); } + if ($orderInfo['pid'] > 0) { + /** @var StoreOrderCartInfoServices $cartInfoService */ + $cartInfoService = app()->make(StoreOrderCartInfoServices::class); + $res = $cartInfoService->getSplitCartList($orderInfo['pid']); + if ($res) { + $this->dao->update($orderInfo['pid'], ['status' => 3]); + } else { + $this->dao->update($orderInfo['pid'], ['status' => 4]); + } + } event('order.delivery', [$orderInfo, $storeName, $data, $type]); return true; } diff --git a/crmeb/app/services/order/StoreOrderSplitServices.php b/crmeb/app/services/order/StoreOrderSplitServices.php index 5a36551d7..f2b24abc5 100644 --- a/crmeb/app/services/order/StoreOrderSplitServices.php +++ b/crmeb/app/services/order/StoreOrderSplitServices.php @@ -72,7 +72,7 @@ class StoreOrderSplitServices extends BaseServices $order_data['cart_id'] = []; $order_data['unique'] = $storeOrderCreateServices->getNewOrderId(''); $order_data['add_time'] = time(); - $order_data['mark'] = '发货拆分订单'; + $order_data['mark'] = '拆分订单'; $new_order = $this->dao->save($order_data); if (!$new_order) { throw new ValidateException('生成新订单失败');