Merge branch 'master' into 0927-selftake-new

app/JsonRpc/OrdersService.php

@@ -19,7 +19,6 @@ use Hyperf\DbConnection\Db;
 use Hyperf\Guzzle\CoroutineHandler;
 use Hyperf\RpcServer\Annotation\RpcService;
 use Hyperf\Di\Annotation\Inject;
-use App\JsonRpc\OrdersServiceInterface;
 
 /**
  * @RpcService(name="OrdersService", protocol="jsonrpc-http", server="jsonrpc-http", publishTo="")
@@ -51,6 +50,12 @@ class OrdersService implements OrdersServiceInterface
      */
     protected $financialRecordService;
 
+    /**
+     * @Inject
+     * @var \App\Service\v3\Interfaces\BadgeServiceInterface
+     */
+    protected $badgeService;
+
     /**
      * 订单完成
      * @param $global_order_id
@@ -314,7 +319,7 @@ class OrdersService implements OrdersServiceInterface
             Db::commit();
 
             // 记录badge
-            $orderChildIds = array_values(array_column($orderChildren, 'store_id'));
+            $orderChildIds = array_values(array_column($orderChildren->toArray(), 'store_id'));
             $this->badgeService->doByOrder($orderMain->user_id, $orderChildIds, $orderMain->global_order_id, OrderState::REFUNDED);
 
             return [