fix

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUserConversation.java

@@ -94,4 +94,9 @@ public class MidjourneyUserConversation extends BaseEntity implements Serializab
      */
     private String properties;
 
+    /**
+     * 书签
+     */
+    private Boolean bookmark;
+
 }

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -1,5 +1,7 @@
 package com.cyksj.model.manage.request;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.cyksj.model.entity.GoodsDiscountPlusPurchaseRelation;
 import lombok.Getter;
 import lombok.Setter;
@@ -150,6 +152,17 @@ public class ReqGoodsSkuInsert {
          * 限制时间
          */
         private int gptLimitTime;
+
+
+        /**
+         * mj fast次数
+         */
+        private Integer mjFastNum;
+
+        /**
+         * mj relax次数
+         */
+        private Integer mjRelaxNum;
     }
 
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonBackView.java

@@ -149,6 +149,13 @@ public class OrderDonBackView {
 	@DbField("sku.days")
 	private Integer days;
 
+	/**
+	 * 是否是镜像服务
+	 */
+	@DbField("sku.is_mirror")
+	private Boolean isMirror;
+
+
 	@DbField("o.num")
 	private Integer num;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonBackView.java

@@ -50,6 +50,9 @@ public class UpgradeOrderDonBackView {
 	@DbField("g.title")
 	private String goodsTitle;
 
+	@DbField("gds.id")
+	private Long skuId;
+
 	@DbField("gds.spec_val")
 	private String goodsSpecVal;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/UpgradeOrderDonSearchView.java

@@ -3,6 +3,7 @@ package com.cyksj.model.manage.views;
 import com.cyksj.model.entity.GoodsDon;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDonWaybill;
+import com.cyksj.model.entity.UpgradeOrderDon;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.DbIgnore;
@@ -45,11 +46,23 @@ public class UpgradeOrderDonSearchView {
 	@DbField("gs.spec_val")
 	private String specVal;
 
+	@DbField("o.money")
+	private BigDecimal money;
+
+	@DbField("o.balance")
+	private BigDecimal balance;
+
+	@DbField("o.refund_money")
+	private BigDecimal refundMoney;
+
+	@DbField("o.refund_balance")
+	private BigDecimal refundBalance;
+
 	@DbField("o.status")
-	private OrderDon.Status status;
+	private UpgradeOrderDon.Status status;
 
 	@DbField("o.type")
-	private OrderDon.Type type;
+	private UpgradeOrderDon.Type type;
 
 	@DbField("o.created_time")
 	private Date createdTime;

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-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -139,7 +139,11 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 }
             });
         }
+        conversation.setBookmark(customId.contains("BOOKMARK"));
         conversationMapper.updateById(conversation);
+        if (conversation.getBookmark()) {
+            return conversation;
+        }
         Map<String, Object> param = MapUtil.builder(new HashMap<String,Object>())
                 .put("taskId", taskId).put("state", user.getId()).put("customId", customId).build();
         SubmitResult result = submit(user.getMode(),"action", param);

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3199,6 +3199,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			Integer success = userMapper.deductBalance(user.getId(), subBalance, userBalance);
 			if (success != 1) throw BusinessRuntimeException.getInstance("您的余额不足!");
 			orderDon.setBalance(subBalance);
+			upgradeOrderDonMapper.updateById(orderDon);
 		}
 	}
 

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

@@ -102,7 +102,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";
 
@@ -224,9 +224,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()).eq(UpgradePackage::getStatus, Boolean.TRUE));
+				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/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;

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

@@ -8,6 +8,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;
@@ -307,12 +308,16 @@ 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);
+        MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+        response.sendRedirect( midjourneyHost + "/8081/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
+    }
+
+    @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/");
+        response.sendRedirect(midjourneyHost + "/draw/web/");
     }
 }

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

@@ -33,6 +33,7 @@ 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;
@@ -55,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.*;
@@ -123,6 +125,9 @@ public class OrderController {
     @Autowired
     private YhShopFrontService yhShopFrontService;
 
+    @Autowired
+    private MidjourneyAccountService midjourneyAccountService;
+
     /**
      * 支付
      * @author chan
@@ -788,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);
     }
 }

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

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