fix 使出加购车票

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

@@ -1074,18 +1074,13 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             OrderDiscountPlusPurchaseSkuRelation discountPlusPurchaseSkuRelation = orderDiscountPlusPurchaseSkuRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseSkuRelation.class)
                     .eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, orderDon.getId()).last("limit 1"));
             if (discountPlusPurchaseSkuRelation != null) {
-                String relationIdsStr = discountPlusPurchaseSkuRelation.getRelationIds();
-                if (StrUtil.isNotBlank(relationIdsStr)) {
+                //选择清除加购车票
+                if (CollUtil.isNotEmpty(dpRelationIds)) {
                     try {
-                        List<Long> relationIds = Jsons.parseList(relationIdsStr, Long.class);
-                        //选择清除加购车票
-                        if (CollUtil.isNotEmpty(dpRelationIds)) {
-                            relationIds = dpRelationIds;
-                        }
                         List<GroupsRelation> groupsRelations = relationMapper.selectList(Wrappers.lambdaQuery(GroupsRelation.class)
                                 .eq(GroupsRelation::getUserId, orderDon.getUserId())
-                                .in(GroupsRelation::getId, relationIds));
-                        log.info("优惠加购订单orderId:{}退款,清除相关车票relation_ids:{}", orderDon.getId(), relationIds);
+                                .in(GroupsRelation::getId, dpRelationIds));
+                        log.info("优惠加购订单orderId:{}退款,清除相关车票relation_ids:{}", orderDon.getId(), dpRelationIds);
                         groupsRelations.forEach(relation -> relationClearService.clearTicket(relation, UserTicketClearedRecord.Source.dp));
                     } catch (Exception e) {
                     }

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

@@ -1341,18 +1341,15 @@ public class CmsOrderController {
 	@GetMapping("/get/dp/relations")
 	public Result<List<GroupRelationDetailView>> getDpRelations(Long orderId) throws Exception {
 		OrderDon orderDon = orderDonMapper.selectById(orderId);
+		List relationIds = new ArrayList<>();
+		relationIds.add(orderDon.getRelationId());
 		OrderDiscountPlusPurchaseSkuRelation orderDiscountPlusPurchaseSkuRelation = plusPurchaseSkuRelationMapper.selectOne(Wrappers.lambdaQuery(OrderDiscountPlusPurchaseSkuRelation.class)
 				.eq(OrderDiscountPlusPurchaseSkuRelation::getOrderId, orderId)
 				.last("limit 1"));
-		if (orderDiscountPlusPurchaseSkuRelation != null) {
-			String relationIds = orderDiscountPlusPurchaseSkuRelation.getRelationIds();
-			if (StrUtil.isNotBlank(relationIds)) {
-				List<Long> longs = Jsons.parseList(relationIds, Long.class);
-				longs.add(orderDon.getRelationId());
-				List<GroupRelationDetailView> groupsRelationViews = beanSearcher.searchAll(GroupRelationDetailView.class, MapUtils.builder().field(GroupRelationDetailView::getUserId, orderDon.getUserId()).field(GroupRelationDetailView::getRelationId, longs).op(Operator.InList).build());
-				return GatewayResponse.SUCCESS.newBuilder().toResult(groupsRelationViews);
-			}
+		if (orderDiscountPlusPurchaseSkuRelation != null && StrUtil.isNotBlank(orderDiscountPlusPurchaseSkuRelation.getRelationIds())) {
+			relationIds.addAll(Jsons.parseList(orderDiscountPlusPurchaseSkuRelation.getRelationIds(), Long.class));
 		}
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
+		List<GroupRelationDetailView> groupsRelationViews = beanSearcher.searchAll(GroupRelationDetailView.class, MapUtils.builder().field(GroupRelationDetailView::getUserId, orderDon.getUserId()).field(GroupRelationDetailView::getRelationId, relationIds).op(Operator.InList).build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(groupsRelationViews);
 	}
 }