Merge branch 'mj' into dev

netflix-service/src/main/java/com/cyksj/service/midjourney/MidjourneyAccountService.java

@@ -22,6 +22,6 @@ public interface MidjourneyAccountService extends IService<MidjourneyAccount> {
 
     void syncAccount(Long id);
 
-    String getMidjourneyUserToken(Long userId, Long relationId);
+    MidjourneyUser getMidjourneyUserToken(Long userId, Long relationId);
 
 }

netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidJourneyAccountServiceImpl.java

@@ -170,14 +170,13 @@ public class MidJourneyAccountServiceImpl extends ServiceImpl<MidjourneyAccountM
 
 
     @Override
-    public String getMidjourneyUserToken(Long userId, Long relationId) {
+    public MidjourneyUser getMidjourneyUserToken(Long userId, Long relationId) {
         GroupsRelation groupsRelation = getGroupsRelation(userId, relationId);
         GroupsTrips groupsTrips = getGroupsTrips(groupsRelation);
         GoodsDonSku goodsDonSku = skuMapper.selectById(groupsTrips.getSkuId());
 
         if (goodsDonSku != null && goodsDonSku.getIsMirror()) {
-            MidjourneyUser midjourneyUser = getMidjourneyUser(userId, relationId, groupsRelation, goodsDonSku);
-            return midjourneyUser.getUserToken();
+            return getMidjourneyUser(userId, relationId, groupsRelation, goodsDonSku);
         } else {
             throw BusinessRuntimeException.getInstance("服务器出了点问题");
         }

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -3,6 +3,7 @@ package com.cyksj.web.controller.manage;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -36,6 +37,7 @@ import com.cyksj.model.manage.views.UpgradeOrderDonBackView;
 import com.cyksj.model.request.*;
 import com.cyksj.model.views.*;
 import com.cyksj.service.mange.CmsOrderDonService;
+import com.cyksj.service.midjourney.MidjourneyAccountService;
 import com.cyksj.service.order.OrderDonCommentService;
 import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.EasyExcelUtils;
@@ -47,6 +49,7 @@ import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -106,6 +109,8 @@ public class CmsOrderController {
 
 	private final OrderDonCustomerServiceRelateMapper orderDonCustomerServiceRelateMapper;
 
+	private final MidjourneyAccountService midjourneyAccountService;
+
 
 	@GetMapping("/get")
 	@SaCheckPermission("order:view")
@@ -933,6 +938,12 @@ public class CmsOrderController {
 	public Result<SearchResult<MidjourneyUserView>> getMidjourneyUser(Long userId,Long relationId) {
 		SearchResult<MidjourneyUserView> search = beanSearcher.search(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(MidjourneyUserView::getUserId,userId).field(MidjourneyUserView::getRelationId,relationId).build());
+		if (CollectionUtil.isEmpty(search.getDataList())) {
+			MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+			MidjourneyUserView midjourneyUserView = new MidjourneyUserView();
+			BeanUtils.copyProperties(midjourneyUser, midjourneyUserView);
+			search.addData(midjourneyUserView);
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -9,6 +9,7 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.ChatgptSession;
 import com.cyksj.model.entity.ChatgptUser;
+import com.cyksj.model.entity.MidjourneyUser;
 import com.cyksj.model.request.gpt.ConversationRequest;
 import com.cyksj.model.response.ConversationLimitResponse;
 import com.cyksj.model.views.ChatGptUserConversationRecordHistoryView;
@@ -311,8 +312,8 @@ public class MirrorController {
     @GetMapping("/midjourneyMirror/{relationId}")
     public void midjourneyMirror(@PathVariable Long relationId,HttpServletResponse response) throws IOException {
         Long userId = StpUserUtil.getLoginIdAsLong();
-        String userToken = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
-        response.sendRedirect( midjourneyHost + "/8081/api/applets/mirror/midjourneyMirrorWithToken/" + userToken);
+        MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+        response.sendRedirect( midjourneyHost + "/8081/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
     }
 
     @GetMapping("/midjourneyMirrorWithToken/{userToken}")