Merge branch 'mj' into dev

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

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

@@ -49,7 +49,6 @@ 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.*;
@@ -109,8 +108,6 @@ public class CmsOrderController {
 
 	private final OrderDonCustomerServiceRelateMapper orderDonCustomerServiceRelateMapper;
 
-	private final MidjourneyAccountService midjourneyAccountService;
-
 
 	@GetMapping("/get")
 	@SaCheckPermission("order:view")
@@ -938,12 +935,6 @@ 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/payment/OrderController.java

@@ -33,9 +33,11 @@ import com.cyksj.model.response.AliPayTradeStatus;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.model.views.MidjourneyUserView;
 import com.cyksj.model.views.OrderCommentView;
+import com.cyksj.service.midjourney.MidjourneyAccountService;
 import com.cyksj.service.order.OrderDonService;
 import com.cyksj.service.paypal.PayPalService;
 import com.cyksj.service.paypal.PaypalPayConfigService;
+import com.cyksj.service.shop.YhShopFrontService;
 import com.cyksj.service.stripe.StripePayConfigService;
 import com.cyksj.service.stripe.StripeService;
 import com.cyksj.service.user.UserBindRelationService;
@@ -54,6 +56,7 @@ import com.stripe.model.checkout.Session;
 import com.stripe.net.Webhook;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -119,6 +122,12 @@ public class OrderController {
     @Autowired
     private StripeService stripeService;
 
+    @Autowired
+    private YhShopFrontService yhShopFrontService;
+
+    @Autowired
+    private MidjourneyAccountService midjourneyAccountService;
+
     /**
      * 支付
      * @author chan
@@ -784,6 +793,11 @@ public class OrderController {
         long userId = StpUserUtil.getLoginIdAsLong();
         MidjourneyUserView search = beanSearcher.searchFirst(MidjourneyUserView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(MidjourneyUserView::getUserId, userId).field(MidjourneyUserView::getRelationId, relationId).build());
+        if (search == null) {
+            MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+            search = new MidjourneyUserView();
+            BeanUtils.copyProperties(midjourneyUser, search);
+        }
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }
 }