Merge branch 'mj' into dev

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -742,8 +742,9 @@ public class OrderController {
      * midjourney查询订单用户账号剩余次数
      */
     @GetMapping("/get/midjourney/user")
-    public Result<SearchResult<MidjourneyUserView>> getMidjourneyUser(Long userId, Long relationId) {
-        SearchResult<MidjourneyUserView> search = beanSearcher.search(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
+    public Result<MidjourneyUserView> getMidjourneyUser(Long relationId) {
+        long userId = StpUserUtil.getLoginIdAsLong();
+        MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(MidjourneyUserView::getUserId, userId).field(MidjourneyUserView::getRelationId, relationId).build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }