feat : spu

app/Amqp/Consumer/Pay/GoodOrderPayFinishConsumer.php

@@ -12,6 +12,7 @@ use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
+use Hyperf\Di\Annotation\Inject;
 use PhpAmqpLib\Message\AMQPMessage;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -27,6 +28,7 @@ class GoodOrderPayFinishConsumer extends ConsumerMessage
     /**
      * @var Log
      */
+    #[Inject]
     protected Log $log;
 
     /**

app/Amqp/Consumer/Refund/GoodOrderRefundFinishConsumer.php

@@ -12,6 +12,7 @@ use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
+use Hyperf\Di\Annotation\Inject;
 use PhpAmqpLib\Message\AMQPMessage;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -28,6 +29,7 @@ class GoodOrderRefundFinishConsumer extends ConsumerMessage
     /**
      * @var Log
      */
+    #[Inject]
     protected Log $log;
 
     /**

app/Service/Amqp/Refund/RefundGoodOrderFinishService.php

@@ -11,6 +11,9 @@ declare(strict_types=1);
 namespace App\Service\Amqp\Refund;
 
 use App\Constants\Common\OrderCode;
+use App\Model\Order;
+use App\Model\PayOrder;
+use App\Model\RefundOrder;
 use App\Service\ServiceTrait\Api\CateringTrait;
 use App\Service\ServiceTrait\Api\CouponTrait;
 use App\Service\ServiceTrait\Api\OrderTrait;
@@ -41,6 +44,21 @@ class RefundGoodOrderFinishService
      */
     public int $orderType;
 
+    /**
+     * @var Order
+     */
+    protected Order $orderInfo;
+
+    /**
+     * @var PayOrder
+     */
+    protected PayOrder $payInfo;
+
+    /**
+     * @var RefundOrder
+     */
+    protected RefundOrder $refundInfo;
+
     /**
      * @return void
      */

app/Service/Common/Pay/Wx/WxJsRechargeOrderService.php

@@ -26,14 +26,14 @@ use function Hyperf\Config\config;
 
 class WxJsRechargeOrderService extends WxJsRechargeBaseService
 {
-    use CheckOrderCallBackTrait,
+    use CheckOrderCallBackTrait;
-        GoodOrderTrait,
+//        GoodOrderTrait,
-        PayFinishTrait,
+//        PayFinishTrait,
-        RefundOrderTrait,
+//        RefundOrderTrait,
-        OrderTrait,
+//        OrderTrait,
-        OrderChangeStatusTrait,
+//        OrderChangeStatusTrait,
-        CateringTrait,
+//        CateringTrait,
-        CouponTrait;
+//        CouponTrait;
 
     /**
      *
@@ -41,36 +41,32 @@ class WxJsRechargeOrderService extends WxJsRechargeBaseService
     const int OrderType = OrderCode::ORDER_TYPE_GOOD;
     const int PayType = PayCode::WECHAT_PAY;
 
-    /**
+//    /**
-     * 订单 id
+//     * 订单 id
-     * @var int
+//     * @var int
-     */
+//     */
-    protected int $orderId;
+//    protected int $orderId;
 
     /**
      * @var string
      */
     protected string $orderNo;
 
-    /**
+//    /**
-     * @var mixed
+//     * @var mixed
-     */
+//     */
-    protected mixed $orderInfo;
+//    protected mixed $orderInfo;
 
-    /**
+//    /**
-     * @var mixed
+//     * @var mixed
-     */
+//     */
-    protected mixed $payInfo;
+//    protected mixed $payInfo;
 
-    /**
+//    /**
-     * @var mixed
+//     * @var mixed
-     */
+//     */
-    protected mixed $refundInfo;
+//    protected mixed $refundInfo;
 
-    /**
-     * @var bool 是否加入配餐数据
-     */
-    protected bool $isCatering = true;
 
     /**
      * @var Producer