Merge branch 'filter_clear_GPT_account'

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

@@ -255,7 +255,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setOrderNo(donNo);
 		orderDon.setOpenId(payOpenId);
 		if (sku.getPrice() != null && payRequest.getDonMoney().compareTo(sku.getPrice()) < 0) {
-			throw BusinessRuntimeException.getInstance("支付金额错误");
+			log.info("规格:{}支付金额:{}异常,调整用户userId:{}支付金额为:{}", sku.getSpecVal(), payRequest.getDonMoney(), user.getId(), sku.getPrice());
+			payRequest.setDonMoney(sku.getPrice());
 		}
 		orderDon.setMoney(payRequest.getDonMoney());
 		orderDon.setRealMoney(payRequest.getDonMoney());

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

@@ -53,6 +53,11 @@ public class GroupRelationClearServiceImpl implements GroupRelationClearService
 		GroupsRelationView groupsRelation = beanSearcher.searchFirst(GroupsRelationView.class,
 				MapUtils.builder().field(GroupsRelationView::getId, relationId).build());
 		if (groupsRelation != null) {
+			//23-06-06 ChatGPT PLUS独立会员账号 过期不清除
+			if (groupsRelation.getSkuId() != null && groupsRelation.getSkuId().equals(177l)) {
+				log.info("未清除过期账号用户userid:{}独立会员账号,relationId:{}", groupsRelation.getUserId(), relationId);
+				return;
+			}
 			Long userId = relation.getUserId();
 			Date startTime = relation.getStartTime();
 			Date expireTime = relation.getExpiryTime();