Merge branch 'master' into pre

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/model/views/MidjourneyUserDetailView.java
#	netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java
#	netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java
#	netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

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

@@ -5,8 +5,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author zwhui

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

@@ -3,6 +3,8 @@ package com.cyksj.model.views;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 项目名: yhlxj
  * 文件名: MidjourneyUserDetailView
@@ -15,4 +17,12 @@ public class MidjourneyUserDetailView {
 	private Integer useFastNum;
 
 	private Integer useRelaxNum;
+
+	private Integer mjFastNum;
+
+	private Integer mjRelaxNum;
+
+	private Long userId;
+
+	private Date expiryTime;
 }

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpCustomerAcquisitionLinkServiceImpl.java

@@ -123,7 +123,10 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
 
         WxCpLinkUpd wxCpLinkUpd = new WxCpLinkUpd();
         wxCpLinkUpd.setLinkId(link.getLinkId());
-        WxCpLinkAddResp wxCpLinkAddResp = corpOps.customerAcquisitionDeleteLink(null, wxCpLinkUpd);
+        try {
+            WxCpLinkAddResp wxCpLinkAddResp = corpOps.customerAcquisitionDeleteLink(null, wxCpLinkUpd);
+        } catch (Exception e) {
+        }
         removeById(id);
     }
 

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -264,7 +264,7 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
             //设置奈飞用户座位
             if (account.getGoodsId() == 1) {
                 User user = userMapper.selectById(relation.getUserId());
-                groupsRelationNetflixService.timingSetNetflix(relation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), relation.getExpiryTime());
+	            groupsRelationNetflixService.timingSetNetflix(relation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), relation.getExpiryTime());
             }
         }
         if (groupsRelations.isEmpty() && verifyCodeList != null && verifyCodeList.size() > 0) {

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -701,7 +701,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             User user = userMapper.selectById(newRelation.getUserId());
             GroupsTrips groupsTrips = groupsMapper.selectById(newRelation.getGroupsId());
             Account account = accountMapper.selectById(groupsTrips.getAccountId());
-            groupsRelationNetflixService.timingSetNetflix(newRelation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), newRelation.getExpiryTime());
+	        groupsRelationNetflixService.timingSetNetflix(newRelation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), newRelation.getExpiryTime());
         }
 
         if (plusPurchaseSkuRelation != null && plus_relationList != null) {

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

@@ -178,6 +178,7 @@ public class MidJourneyAccountServiceImpl extends ServiceImpl<MidjourneyAccountM
         param.put("userToken", midjourneyAccount.getUserToken());
         param.put("remark", midjourneyAccount.getId());
         param.put("userAgent", User_Agent_LIST.get(new Random().nextInt(User_Agent_LIST.size())));
+        param.put("timeoutMinutes", 10);
         return param;
     }
 

netflix-service/src/main/java/com/cyksj/service/order/OrderDonService.java

@@ -14,7 +14,6 @@ import com.cyksj.model.entity.UpgradeOrderDon;
 import com.cyksj.model.manage.views.UpgradeOrderDetailView;
 import com.cyksj.model.request.AlipayOrderDonReq;
 import com.cyksj.model.request.OrderPayRequest;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;

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

@@ -1531,6 +1531,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			log.info("分销订单orderId:{}对应平台goodsId:{}不存在或已不参与分成比例", order.getId(), order.getGoodsId());
 			return;
 		}
+		if (order.getSkuId() != null) {
+			goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
+		}
 		UserDistributeShared userDistributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class).eq(UserDistributeShared::getUserId, order.getUserId()).last("limit 1"));
 		if (userDistributeShared != null) {
 			distributeWaitingSendPoints.setSharedId(userDistributeShared.getSharedId());
@@ -1554,7 +1557,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					rate = goodsDon.getRate();
 					//实物分销比例
 					if (goodsDon.getType() == 2) {
-						goodsDonSku = goodsDonSkuMapper.selectById(order.getSkuId());
 						if (goodsDonSku != null) {
 							//不包含套餐权益
 							if (!goodsDonSku.getIsBenefits()) {
@@ -2340,6 +2342,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		} else {
 			//修改车位状态并发送模板消息
 			updateCarParkAndSendMsg(goodsDon, sku, orderDon);
+		}
+		//同步车票是否重购 记录
+		TASK_POOL.execute(() -> {
 			if (goodsDon.getId() == 1) {
 				//设置netflix座位号
 				GroupsRelation relation = groupsRelationMapper.selectById(orderDon.getRelationId());
@@ -2350,9 +2355,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					groupsRelationNetflixService.timingSetNetflix(relation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), relation.getExpiryTime());
 				}
 			}
-		}
-		//同步车票是否重购 记录
-		TASK_POOL.execute(() -> {
 			groupsRelationExpiryRecordService.syncGroupsRelationExpiryRecord(orderDon, goodsDon, sku);
 			if (orderDon.getYhsId() == 0) {
 				//发送下单后 若有手机 发送短信

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

@@ -109,6 +109,8 @@ public class CmsOrderController {
 
 	private final MidjourneyUserConversationMapper midjourneyUserConversationMapper;
 
+	private final MidjourneyUserMapper midjourneyUserMapper;
+
 
 	@GetMapping("/get")
 	@SaCheckPermission("order:view")
@@ -968,9 +970,33 @@ public class CmsOrderController {
 	 * midjourney查询订单用户账号剩余次数
 	 */
 	@GetMapping("/get/midjourney/user")
-	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());
-		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	public Result<MidjourneyUserDetailView> getMidjourneyUser(Long orderId) {
+		OrderDon orderDon = orderDonMapper.selectById(orderId);
+		//续费订单
+		Date startTime = null;
+		Date expiryTime = null;
+		if (orderDon.getOrderType() == 2) {
+			GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+			GroupsRelation relation = relationMapper.selectOne(Wrappers.lambdaQuery(GroupsRelation.class)
+					.eq(GroupsRelation::getId, orderDon.getRelationId())
+					.eq(GroupsRelation::getUserId, orderDon.getUserId()).last("limit 1"));
+			if (relation == null) {
+				return GatewayResponse.SUCCESS.newBuilder().toResult();
+			}
+			startTime = relation.getStartTime();
+			startTime = DateUtil.offsetMonth(startTime, sku.getMonths());
+			expiryTime = relation.getExpiryTime();
+		}
+		MidjourneyUserDetailView midjourneyUserDetailView = midjourneyUserConversationMapper.getMjMirrorOrderDetail(orderDon.getRelationId(), startTime, expiryTime);
+
+		GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+		MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class)
+				.eq(MidjourneyUser::getRelationId, orderDon.getRelationId())
+				.last("limit 1"));
+		midjourneyUserDetailView.setUserId(orderDon.getUserId());
+		midjourneyUserDetailView.setExpiryTime(midjourneyUser.getExpireTime());
+		midjourneyUserDetailView.setMjFastNum(sku.getMjFastNum() - midjourneyUserDetailView.getUseFastNum());
+		midjourneyUserDetailView.setMjRelaxNum(sku.getMjRelaxNum() - midjourneyUserDetailView.getUseRelaxNum());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(midjourneyUserDetailView);
 	}
 }