diff --git a/app/Model/Order.php b/app/Model/Order.php index c6d8903..8a6ab7c 100644 --- a/app/Model/Order.php +++ b/app/Model/Order.php @@ -85,9 +85,9 @@ class Order extends Model /** * @param string $orderSno - * @return \Hyperf\Database\Model\Model|Builder|BuildsQueries|null + * @return \Hyperf\Database\Model\Model|Builder|Order|null */ - public function getInfoByOrderSno(string $orderSno): \Hyperf\Database\Model\Model|Builder|BuildsQueries|null + public function getInfoByOrderSno(string $orderSno): \Hyperf\Database\Model\Model|Builder|Order|null { return $this->where('order_sno',$orderSno)->first(); } diff --git a/app/Service/ServiceTrait/Api/RefundOrderTrait.php b/app/Service/ServiceTrait/Api/RefundOrderTrait.php index 21dc81a..da7760c 100644 --- a/app/Service/ServiceTrait/Api/RefundOrderTrait.php +++ b/app/Service/ServiceTrait/Api/RefundOrderTrait.php @@ -6,7 +6,10 @@ use App\Constants\Common\OrderCode; use App\Constants\Common\PayCode; use App\Constants\Common\RefundCode; use App\Exception\ErrException; +use App\Model\Order; use App\Model\OrderGood; +use App\Model\PayOrder; +use App\Model\RefundOrder; use Exception; use Hyperf\Di\Annotation\Inject; use Psr\Container\ContainerExceptionInterface; @@ -14,6 +17,24 @@ use Psr\Container\NotFoundExceptionInterface; trait RefundOrderTrait { + /** + * @var RefundOrder + */ + #[Inject] + protected RefundOrder $refundOrderModel; + + /** + * @var Order + */ + #[Inject] + protected Order $orderModel; + + /** + * @var PayOrder + */ + #[Inject] + protected PayOrder $payOrderModel; + /** * @return void */