合并新版下单和回调功能

app/common/repositories/store/order/StoreOrderRepository.php

@@ -12238,7 +12238,7 @@ class StoreOrderRepository extends BaseRepository
             }
         }
     }
-}
+
     public function useKillOrderRewards($groupOrderId, $orderId, $uid,$adminId)
     {
         if (empty($orderId) || empty($groupOrderId) || empty($uid)) {