Merge branch 'mj' into dev

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java
#	netflix-web/src/main/resources/application-dev.yml
#	netflix-web/src/main/resources/application-prd.yml

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

@@ -43,6 +43,10 @@ public class UpgradeOrderDon extends BaseEntity {
 
     private String transactionId;
 
+    private Integer num;
+
+    private BigDecimal price;
+
     /**
      * 金额
      */

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

@@ -23,7 +23,9 @@ import java.util.List;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select * from upgrade_order_don :orderId:) o left join upgrade_package up on o.package_id = up.id ")
+@SearchBean(tables = "(select * from upgrade_order_don :orderId:) o left join upgrade_package up on o.package_id = up.id " +
+		"left join goods_don g on g.id = up.goods_id " +
+		"left join goods_don_sku gs on gs.id = up.sku_id ")
 public class UpgradeOrderDonSearchView {
 	@DbField("o.id")
 	private Long id;
@@ -31,9 +33,18 @@ public class UpgradeOrderDonSearchView {
 	@DbField("up.name")
 	private String name;
 
+	@DbField("up.price")
+	private BigDecimal price;
+
 	@DbField("up.num")
 	private Integer num;
 
+	@DbField("g.title")
+	private String title;
+
+	@DbField("gs.spec_val")
+	private String specVal;
+
 	@DbField("o.status")
 	private OrderDon.Status status;
 

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

@@ -3167,6 +3167,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			upgradeOrderDon.setOriginalOrderId(payRequest.getOriginalOrderId());
 			upgradeOrderDon.setRelationId(payRequest.getRelationId());
 			upgradeOrderDon.setPackageId(payRequest.getPackageId());
+			upgradeOrderDon.setPrice(upgradePackage.getPrice());
+			upgradeOrderDon.setNum(upgradePackage.getNum());
 			upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());
 			upgradeOrderDon.setMoney(payRequest.getDonMoney());
 			upgradeOrderDon.setStatus(UpgradeOrderDon.Status.noPayment);
@@ -3264,7 +3266,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//买家支付宝账号
 		String buyerId = params.get("buyer_id");
 		log.info("支付宝回调信息:{}", Jsons.toJson(params));
-		if (!orderDon.getStatus().equals(OrderDon.Status.noPayment) && !orderDon.getStatus().equals(OrderDon.Status.close)) {
+		if (!orderDon.getStatus().equals(UpgradeOrderDon.Status.noPayment) && !orderDon.getStatus().equals(UpgradeOrderDon.Status.close)) {
 			log.info("支付宝已回调，重复修改状态 id:{}", orderDon.getId());
 			return;
 		}
@@ -3298,7 +3300,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	 * 统一订单信息回调
 	 */
 	public void unifiedHandlerUpgradeOrderNotify(UpgradeOrderDon orderDon, UpgradePackage upgradePackage) {
-		orderDon.setStatus(UpgradeOrderDon.Status.hasPayment);
+		orderDon.setStatus(UpgradeOrderDon.Status.complete);
 		int isSuccess = upgradeOrderDonMapper.update(null,Wrappers.lambdaUpdate(UpgradeOrderDon.class)
 				.set(UpgradeOrderDon::getStatus, orderDon.getStatus())
 				.in(UpgradeOrderDon::getStatus, List.of(UpgradeOrderDon.Status.noPayment, UpgradeOrderDon.Status.close))

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

@@ -101,6 +101,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final UserLoginRecordService userLoginRecordService;
 
+	private final UpgradeOrderDonMapper upgradeOrderDonMapper;
+
+	private final static String VERIFY_CODE_SECRET = "q1w2e3";
 	private final CuiQiuMailService cuiQiuMailService;
 
 	//脆球邮箱后缀
@@ -228,6 +231,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				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<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getUserId, ticket.getUserId()).eq(UpgradeOrderDon::getGoodsId, ticket.getGoodsId()));
+				if (CollectionUtil.isNotEmpty(upgradeOrderDons)) {
+					upgradeOrderDons.stream().map(UpgradeOrderDon::getNum).reduce(Integer::sum).ifPresent(e -> ticket.setMjFastNum(e + ticket.getMjFastNum()));
+				}
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
 			ticket.setRelationViews(relationUserViews);

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

@@ -25,6 +25,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.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -61,6 +62,9 @@ public class MirrorController {
 
     private final MidjourneyAccountService midjourneyAccountService;
 
+    @Value("${midjourney.host}")
+    private String midjourneyHost;
+
 
     /**
      * GPT车票跳转登录
@@ -304,8 +308,11 @@ public class MirrorController {
      * @param relationId 车票id
      */
     @GetMapping("/midjourneyMirror/{relationId}")
-    public Result<String> midjourneyMirror(@PathVariable Long relationId) {
+    public Result<String> midjourneyMirror(@PathVariable Long relationId) throws IOException {
         Long userId = StpUserUtil.getLoginIdAsLong();
-        return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyAccountService.getMidjourneyUserToken(userId, relationId));
+        String userToken = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
+        response.setHeader("userToken", userToken);
+        response.sendRedirect(midjourneyHost+"/draw/web/");
+        return GatewayResponse.SUCCESS.newBuilder().toResult(userToken);
     }
 }

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

@@ -193,4 +193,7 @@ chatgpt:
 
 smsVerify:
   apikey: bc0737b7339ab0f275f954a161fdb313
-  shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
+  shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
+
+midjourney:
+  url: https://nf.video