Merge branch 'mj' into dev

# Conflicts:
#	netflix-web/src/main/resources/application-prd.yml

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -101,7 +101,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final UserLoginRecordService userLoginRecordService;
 
-	private final UpgradeOrderDonMapper upgradeOrderDonMapper;
+	private final UpgradePackageMapper upgradePackageMapper;
 
 	private final static String VERIFY_CODE_SECRET = "q1w2e3";
 	private final CuiQiuMailService cuiQiuMailService;
@@ -227,9 +227,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				ticket.setPayTime(payTime);
 			}
 			if (ticket.getGoodsId() == 26 && ticket.getIsMirror()){
-				List<GoodsDonSku> goodsDonSkus = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getId, ticket.getSkuId()));
-				if (CollectionUtil.isNotEmpty(goodsDonSkus)){
-					goodsDonSkus.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
+				List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).eq(UpgradePackage::getSkuId, ticket.getSkuId()));
+				if (CollectionUtil.isNotEmpty(upgradePackages)){
+					upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
 				}
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));

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

@@ -312,10 +312,14 @@ public class MirrorController {
     public void midjourneyMirror(@PathVariable Long relationId,HttpServletResponse response) throws IOException {
         Long userId = StpUserUtil.getLoginIdAsLong();
         String userToken = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+        response.sendRedirect( midjourneyHost + "/applets/mirror/midjourneyMirrorWithToken/" + userToken);
+    }
+
+    @GetMapping("/midjourneyMirrorWithToken/{userToken}")
+    public void midjourneyMirrorWithToken(@PathVariable String userToken,HttpServletResponse response) throws IOException {
         Cookie cookie = new Cookie("userToken", userToken);
         cookie.setMaxAge(31536000);
         cookie.setPath("/");
-        cookie.setDomain(midjourneyHost);
         response.addCookie(cookie);
         response.sendRedirect("https://" + midjourneyHost + "/draw/web/");
     }

netflix-web/src/main/resources/application-pre.yml

@@ -196,4 +196,4 @@ smsVerify:
   shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
 
 midjourney:
-  url: nf.video
+  url: https://nf.video