Merge branch 'set_nf_pin' into pre

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -331,5 +331,5 @@ public interface Constant {
 	/**
 	 * 电影域名
 	 */
-	String ZHAOJU_MOVIES = "https://zhaoju666.com/8081/api";
+	String ZHAOJU_MOVIES = "https://zhaoju666.com";
 }

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

@@ -59,6 +59,7 @@ import com.cyksj.service.order.UserRealOrderBenefitsService;
 import com.cyksj.service.relation.GroupRelationClearService;
 import com.cyksj.service.relation.GroupRelationFrontService;
 import com.cyksj.service.relation.GroupsRelationExpiryRecordService;
+import com.cyksj.service.relation.GroupsRelationNetflixService;
 import com.cyksj.service.shop.YhShopDistributeService;
 import com.cyksj.service.user.UserBenefitsService;
 import com.cyksj.service.user.UserBindRelationService;
@@ -188,6 +189,10 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
 
     private final UserBindRelationService userBindRelationService;
 
+    private final GroupsRelationNetflixService groupsRelationNetflixService;
+
+    private final AccountMapper accountMapper;
+
     private static final GlobalThreadPoolTaskExecutor TASK_POOL = GlobalThreadPoolTaskExecutor.getInstance();
 
     @Override
@@ -689,6 +694,14 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             delMirrorUser(orderDon.getGoodsId(), orderDon.getRelationId());
         }
 
+        //奈飞车票
+        if (orderDon.getGoodsId() == 1) {
+            User user = userMapper.selectById(newRelation.getUserId());
+            GroupsTrips groupsTrips = groupsMapper.selectById(newRelation.getGroupsId());
+            Account account = accountMapper.selectById(groupsTrips.getAccountId());
+            groupsRelationNetflixService.setNetflixSeatNum(newRelation.getNum(), user.getNickname(), account.getAccount(), account.getPassword(), newRelation.getExpiryTime());
+        }
+
         if (plusPurchaseSkuRelation != null && plus_relationList != null) {
             plus_relationList.remove(relationId);
             plus_relationList.add(newRelation.getId());

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

@@ -55,7 +55,7 @@ public class GroupsRelationNetflixServiceImpl implements GroupsRelationNetflixSe
 		params.putOpt("seat_num", seatNum);
 		params.putOpt("seat_time", expiryTime);
 		//设置座位
-		String url = Constant.ZHAOJU_MOVIES + "/netflix_seat";
+		String url = Constant.ZHAOJU_MOVIES + "/netflix_set/netflix_password_change";
 		try {
 			HttpResponse<String> res =
 					J11HttpC.custom()
@@ -75,7 +75,9 @@ public class GroupsRelationNetflixServiceImpl implements GroupsRelationNetflixSe
 		} catch (Exception e) {
 			log.error("设置用户:{}奈飞座位号错误,msg:{}", seatName, StringUtil.getErrorText(e));
 		}
-		return null;
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.putOpt("status", 2);
+		return jsonObject;
 	}
 
 	@Override
@@ -99,7 +101,7 @@ public class GroupsRelationNetflixServiceImpl implements GroupsRelationNetflixSe
 		JSONObject params = new JSONObject();
 		params.putOpt("transId", taskId);
 		//查询任务状态
-		String url = Constant.ZHAOJU_MOVIES + "/netflix_seat";
+		String url = Constant.ZHAOJU_MOVIES + "/netflix_set/netflix_task_status";
 		HttpResponse<String> res =
 				J11HttpC.custom()
 						.ofPost()